dumped more setting changes
Merge branch 'master' of github.com:dduan/dotfiles