Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jul 2016 14:49:45 +0000 (10:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jul 2016 14:49:45 +0000 (10:49 -0400)

Trivial merge