vimrc typo and add hg branch to git branch function.