Added more Plugins to vimrc.
Fixed merge conflict.
vimrc: Use different fonts depending on client.
zshrc: do not share command history between sessions.
Merge branch 'master' of github.com:mknaf/dotfiles

Conflicts:
	vimrc