Install tox 1.6.1 on travis
Merge branch 'master' of https://github.com/ramielrowe/idmapshift