Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Mar 2017 19:27:34 +0000 (14:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Mar 2017 19:27:34 +0000 (14:27 -0500)

Trivial merge