Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Dec 2016 16:06:22 +0000 (11:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Dec 2016 16:06:22 +0000 (11:06 -0500)

Trivial merge