gvimrc: removed trailing whitespace
vim: removed all bundles, back to single file