Add other settings I have set.
Merge branch 'master' of github.com:stwr667/.dotfiles