Merge branch 'master' of github.com:gbonfant/dotfiles