Dan's changes rebased on vmalloc's

This includes disabling some stuff and various other changes
which I haven't found the time to sort out into the prospective
files.