added upstream merge shortcut
altered the PS1 prompt