Python 3 fixes, add django 1.6 in tox