Updating iterm2 prefs and zsh aliases
Merge branch 'master' of github.com:djoshea/dotFiles