Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jul 2016 20:22:56 +0000 (16:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jul 2016 20:22:56 +0000 (16:22 -0400)

Trivial merge