Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Apr 2016 12:36:01 +0000 (08:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Apr 2016 12:36:01 +0000 (08:36 -0400)

Trivial merge