this is needed for the git version in my work computer
Merge branch 'master' of github.com:gnagno/dotfiles