Remove Python 2.5 because tox doesn't support it
Merge branch 'master' into feature/41-ssh-config