Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 May 2016 15:05:32 +0000 (11:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 May 2016 15:05:32 +0000 (11:05 -0400)

Trivial merge