Fixed typo in alias.
Merge branch 'master' of https://github.com/arkottke/dotfiles
Merge branch 'master' of https://github.com/arkottke/dotfiles
Merge branch 'master' of https://github.com/arkottke/dotfiles
Fixed conflicts in zshrc