Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 16:00:12 +0000 (12:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 16:00:12 +0000 (12:00 -0400)

Trivial merge