Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 May 2016 16:11:02 +0000 (12:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 May 2016 16:11:02 +0000 (12:11 -0400)

Trivial merge