changed ssh and pypi config
Merge branch 'master' of github.com:reinhardt/dotfiles

Conflicts:
	src/.ssh/config