Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Feb 2017 15:10:52 +0000 (10:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Feb 2017 15:10:52 +0000 (10:10 -0500)

Trivial merge