uncommented color_branch, added function to PS1