Update vimrc layout. Move bundles into separate file.