Merge branch 'release/1.0.0' v1.0.0
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Jun 2016 17:54:23 +0000 (13:54 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Jun 2016 17:54:23 +0000 (13:54 -0400)

Trivial merge