Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 21 May 2015 17:33:18 +0000 (13:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 21 May 2015 17:33:18 +0000 (13:33 -0400)

Trivial merge