New modules and more vim goodness