Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Jul 2016 18:43:05 +0000 (14:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Jul 2016 18:43:05 +0000 (14:43 -0400)

Trivial merge