Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 18:20:03 +0000 (14:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 18:20:03 +0000 (14:20 -0400)

Trivial merge