Merge branch 'release/1.0.0'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Apr 2016 18:35:14 +0000 (14:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Apr 2016 18:35:14 +0000 (14:35 -0400)

Trivial merge