Updated omz
Merge branch 'master' of github.com:arnlaugsson/dotfiles
Updated .zshrc