added __git_ps1 to prompt and fixed intentation

added git information (which __git_ps1 provides) to the prompt-functions
prompt_utf8 and prompt_normal