Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Jun 2015 16:02:13 +0000 (12:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Jun 2015 16:02:13 +0000 (12:02 -0400)

Trivial merge