Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Oct 2015 13:11:02 +0000 (09:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Oct 2015 13:11:02 +0000 (09:11 -0400)

Trivial merge