Make it easier to edit zshrc
Merge branch 'master' of github.com:wasbazi/dotfiles

Conflicts:
	vim/vimrc_commands
	zsh/zsh_aliases
Merge branch 'master' of github.com:wasbazi/dotfiles

Conflicts:
	zsh/zsh_aliases
	zsh/zsh_path