Merge branch 'release/1.0.0'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Jun 2015 20:38:11 +0000 (16:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Jun 2015 20:38:11 +0000 (16:38 -0400)

Trivial merge