editor should be common for shells
Merge branch 'master' of https://github.com/kul/dotfiles

Conflicts:
	.vimrc
	.zshrc