Merge branch 'master' of github.com:marcusandre/dotfiles
revert git setup.