More Tombot awesomeness
Cleaning up extra files
Merge pull request #19 from mr-joshua/master

More Tombot awesomeness