Fixing merge conflicts.
Merge branch 'master' of github.com:ColbyAley/dotfiles
Merge branch 'master' of github.com:ColbyAley/dotfiles
Merge branch 'master' of github.com:ColbyAley/dotfiles
Merge branch 'master' of github.com:ColbyAley/dotfiles
Merge branch 'master' of github.com:ColbyAley/dotfiles
Merge branch 'master' of github.com:ColbyAley/dotfiles
Updating zsh etc