Merge branch 'release/1.0.1' v1.0.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 19 Jan 2017 13:45:18 +0000 (08:45 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 19 Jan 2017 13:45:18 +0000 (08:45 -0500)

Trivial merge