Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Feb 2016 14:11:35 +0000 (09:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Feb 2016 14:11:35 +0000 (09:11 -0500)

Trivial merge