Merge branch 'release/1.0.0' master v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Sep 2017 17:05:55 +0000 (13:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Sep 2017 17:05:55 +0000 (13:05 -0400)

Trivial merge