Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 17:52:07 +0000 (13:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 17:52:07 +0000 (13:52 -0400)

Trivial merge