Have pip use mirrors when PyPi is down.
Merge branch 'master' of github.com:roshambo/dotfiles

Conflicts:
	ubuntu/.bashrc