updated vimrc, and tag_links to better deal with branches