tox.ini: Add py33, py34
Resolve merge conflict
Merge branch 'msabramo-tox_py33_py34'