vim: Auto save.

Also some refactoring.