Merge branch 'local-install'

Conflicts:
	after/ftplugin/markdown/instant-markdown.vim