Began refactoring vim opt stuff, but I'm thinking this isn't high priority for now.