Merge branch 'release/1.0.0' master v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Jul 2017 13:10:03 +0000 (09:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Jul 2017 13:10:03 +0000 (09:10 -0400)

Trivial merge