Overlay refactoring.
Support text vim options in addition to boolean ones.
Merge branch 'overlays'