Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jan 2016 15:24:28 +0000 (10:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jan 2016 15:24:28 +0000 (10:24 -0500)

Trivial merge