Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 12:54:17 +0000 (08:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 12:54:17 +0000 (08:54 -0400)

Trivial merge