Tox
Merge pull request #16 from nbellowe/master

Tox
Moving around
Screwed up last commit
Missed tests
Merge pull request #18 from nbellowe/master

Move stuff around farther