First real commit.
Merge branch 'master' of https://github.com/bushwack/Tartarus