add git branch, colors to prompt
update some git stuff
up for history-search-backward but not C-o