Fixed bash branch function and some other vim/git stuff