Divide PS1 into __PS1_PREFIX and __PS2_SUFFIX
Finish command prompt with ;
Add git aware prompt - show branch name on prompt