Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 13:05:25 +0000 (09:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 13:05:25 +0000 (09:05 -0400)

Trivial merge