Spring clean + vim goodness