Merge branch 'release/1.0.0' master v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 12:45:47 +0000 (08:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 12:45:47 +0000 (08:45 -0400)

Trivial merge