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

Trivial merge