minor adjustments
Merge branch 'master' of https://github.com/bling/dotvim
remove unneeded syntax swapping, fallback mapping for search