git-prompt.sh integrated. plus some cleanup