Fix the syntax of .gitignore
Merge pull request #19 from dstufft/correct-ignore

Fix the syntax of .gitignore
Switch to using six
Switch to using tox to run our tests and expect PyPy to pass