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

Trivial merge