Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 18:16:35 +0000 (14:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 18:16:35 +0000 (14:16 -0400)

Trivial merge