Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 15:39:07 +0000 (11:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 15:39:07 +0000 (11:39 -0400)

Trivial merge