Support Python 2.6
Resolve merge conflicts in tox.ini
Merge branch 'msabramo-py26'