Fix lesskey pageup/down keybinding (was reversed)
Update vsvimrc with return=clear search binding
Reenable automerge for semanticmerge git mergetool definition