Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:19:19 +0000 (11:19 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 17 Jul 2014 15:19:19 +0000 (11:19 -0400)

Trivial merge