Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Mar 2015 21:09:07 +0000 (16:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Mar 2015 21:09:07 +0000 (16:09 -0500)

Trivial merge