Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Feb 2015 15:31:44 +0000 (10:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Feb 2015 15:31:44 +0000 (10:31 -0500)

Trivial merge