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

Trivial merge