Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 19:39:31 +0000 (15:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 19:39:31 +0000 (15:39 -0400)

Trivial merge