Merge bash includes into bashrc and vim includes into vimrc
Fix vimrc