Changed to Oh-My-Zsh
Merge branch 'master' of https://github.com/med-abidi/dotfiles

Conflicts:
	vim/vimrc.symlink
	zsh/omzsh.zsh
	zsh/zpresto.zxsh