Split bundles out of .vimrc.
Add ftplugin.
Tweak the default conf a little.