Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Jun 2016 17:16:37 +0000 (13:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Jun 2016 17:16:37 +0000 (13:16 -0400)

Trivial merge