some more settings
Merge branch 'master' of github.com:XANi/config