Merge branch 'hotfix/0.1.1' v0.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Jan 2016 21:07:49 +0000 (16:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Jan 2016 21:07:49 +0000 (16:07 -0500)

Trivial merge