Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 16:45:19 +0000 (12:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Oct 2016 16:45:19 +0000 (12:45 -0400)

Trivial merge