Updated prompt

Looks for three color variables:
prompt_color_success
prompt_color_error
prompt_color_git
Some git shortcut changes