Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 13:00:17 +0000 (09:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 13:00:17 +0000 (09:00 -0400)

Trivial merge