VIM:  Some mappings and small changes.