Merge branch 'release/1.0.1'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Apr 2015 18:56:20 +0000 (14:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Apr 2015 18:56:20 +0000 (14:56 -0400)

Trivial merge