Merge branch 'release/1.0.1' v1.0.1
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 15 Sep 2016 19:39:05 +0000 (15:39 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 15 Sep 2016 19:39:05 +0000 (15:39 -0400)

Trivial merge