Better fold format, and folds in this file!

In order to get folds to work in this file, you need to use the foldexpr set
up in my filetype_overrides plugin.
updating fold format, plus other useful commands