some adjustments
Merge branch 'master' of https://github.com/mattiasgiese/dotfiles
some adjustments