More settings updates
Merge branch 'master' of https://github.com/sontek/dotfiles