Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 14:02:31 +0000 (09:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 14:02:31 +0000 (09:02 -0500)

Trivial merge