Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Apr 2017 13:21:42 +0000 (09:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Apr 2017 13:21:42 +0000 (09:21 -0400)

Trivial merge