Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Feb 2015 15:59:38 +0000 (10:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Feb 2015 15:59:38 +0000 (10:59 -0500)

Trivial merge