Update settings
Merge branch 'master' of github.com:baldurpan/dotfiles