enable rerere
emphasize if im in an action (rebase, merge, etc) state in my prompt
some nice new vimrc stuff