Merge branch 'master' of https://github.com/allevaton/dotfiles into pull
Merge branch 'pull'
updated vimrc with a new feature: z/