Merge pull request #8 from ziadsawalha/py33

Python 3.x Compatiblity
Fixes to Tests

- Now runs with testr
- flake8 skips contrib