Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Dec 2016 13:16:09 +0000 (08:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Dec 2016 13:16:09 +0000 (08:16 -0500)

Trivial merge