Merge pull request #1 from treyhunner/fixes

Remove raw_input from all files and remove if True
Add tests
Simplify tests