Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Mar 2016 19:11:55 +0000 (14:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Mar 2016 19:11:55 +0000 (14:11 -0500)

Trivial merge