Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Mar 2017 14:54:52 +0000 (10:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Mar 2017 14:54:52 +0000 (10:54 -0400)

Trivial merge