Clean up vimrc, start moving config sections with their relevant bundles