vimrc consolidated with local version and tab shortcuts added