Merge branch 'release/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Apr 2016 14:51:31 +0000 (10:51 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Apr 2016 14:51:31 +0000 (10:51 -0400)

Trivial merge