dot file update
Merge branch 'master' of github.com:rtouze/dotfiles