remove unittest2 references
kill all references to unittest2
python 2.6 test compatibility
python 2.6 compatibility
add tox.ini
Merge branch 'master' into kill-unittest