added some setings
Merge branch 'master' of https://github.com/ingsme/dotfiles