Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Jun 2017 14:07:17 +0000 (10:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Jun 2017 14:07:17 +0000 (10:07 -0400)

Trivial merge