Add several new vim modules
Fix prep-db and reset-db to be more general