Merge pull request #3 from chadlung/master

Adding requirements to get tox working and ready for Jenkins (still not ...
Merge remote-tracking branch 'upstream/master'
Fix formatting