A bunch of changes; include some external vim scripts