Updates from NateMac
Merge branch 'master' of github.com:n8henrie/.dotfiles