Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 12:52:14 +0000 (08:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 12:52:14 +0000 (08:52 -0400)

Trivial merge