Dotfiles update
Merge branch 'master' of github.com:jenssegers/Dotfiles