map ; to : in cmd; re-add wrap
Merge branch 'master' of github.com:px0/dotfiles

Conflicts:
	vimrc.local
add some shortcuts to zshrc