Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 13:35:41 +0000 (08:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 13:35:41 +0000 (08:35 -0500)

Trivial merge