improve gvimmerge

Change-Id: Ia6b607be73379819c3a64a3980ba05acf827fa23
move vimfiles.stefan/... to vimfiles.stefan/after

Change-Id: I0469122bf65ddf24129151b2a82619011a6a4879