First commit
Merge branch 'master' of https://github.com/slothier/slothier

Stupid fast forward.