Add undotree bundle and mappings

Move undo settings from EXPERIMENTAL to GENERAL.
Move settings from EXPERIMENTAL to GENERAL

Clean up GENERAL.
Move EXPERIMENTAL to end of file
Clean up white space and comments