More bundles, macros

Learn vimscript the hard way!