Update deploy
Update zprofile
Add zlogin
Merge branch 'master' of github.com:kiike/dotfiles

Conflicts:
	zprofile