Removed (commented) some settings
Merge branch 'master' of github.com:dxtr/dotfiles