Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Feb 2017 14:48:54 +0000 (09:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Feb 2017 14:48:54 +0000 (09:48 -0500)

Trivial merge