Merge branch 'upgrade-fugitive' into experimental
Merge branch 'replace-vimclojure' into experimental