Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 14:03:48 +0000 (09:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 14:03:48 +0000 (09:03 -0500)

Trivial merge