Merge branch 'release/1.0.0' v1.0.0
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Jun 2017 20:46:57 +0000 (16:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Jun 2017 20:46:57 +0000 (16:46 -0400)

Trivial merge