Some changes

- changed bash prompt
- added git-prompt to functions
- changed/added macros in git config