Update configuration
Merge branch 'master' of github.com:mkuhnt/dotfiles