Merge pull request #6 from chadlung/master

Fixed wrong import mapping and two PEP8 issues
Update README.md
cleaning up header management
test fixing and code refactoring
Merge branch 'master' of github.com:zinic/pyrox
pep8 fu