Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Jun 2016 12:14:43 +0000 (08:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Jun 2016 12:14:43 +0000 (08:14 -0400)

Trivial merge