Rename vim bundles file and minor changes to vimrc
Remove trailing whitespace from colorscheme