Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Oct 2015 16:36:10 +0000 (12:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Oct 2015 16:36:10 +0000 (12:36 -0400)

Trivial merge