reworked .gitconfig
compatibility issues with git-prompt
reworked .git-prompt.conf