Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:14:12 +0000 (15:14 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 20:14:12 +0000 (15:14 -0500)

Trivial merge