Improve aliases
Make sure vim is used as editor
Merge branch 'master' of github.com:wichtounet/dotfiles

Conflicts:
	.zshrc