Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:55:38 +0000 (10:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:55:38 +0000 (10:55 -0500)

Trivial merge