Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Jun 2017 16:18:04 +0000 (12:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Jun 2017 16:18:04 +0000 (12:18 -0400)

Trivial merge