Moved my own settings from .vim/bundles to just .vim/

Bundles seem to be intended as read-only,
so that's a problem for personal settings.