Add a bunch of new vim modules; simplify Makefile