Add pip
Merge branch 'master' of github.com:negonicrac/.dotfiles-local

Conflicts:
	zshrc.local