blah
Merge pull request #1 from tjfwalker/master

I love what you did with this, you're the greatest!