A big vsmap cleanup and more moving
Merge branch 'master' of https://github.com/vapoursynth/vapoursynth.git