Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 18:11:48 +0000 (14:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 18:11:48 +0000 (14:11 -0400)

Trivial merge