Scavange settings from amazon branch.
Merge branch 'master' of github.com:everett1992/dotfiles