Merge branch 'release/1.0.1' v1.0.1
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 18:14:23 +0000 (14:14 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 18:14:23 +0000 (14:14 -0400)

Trivial merge