Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Sep 2016 18:21:03 +0000 (14:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Sep 2016 18:21:03 +0000 (14:21 -0400)

Trivial merge