Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 17:40:09 +0000 (12:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 17:40:09 +0000 (12:40 -0500)

Trivial merge