update
Merge branch 'master' of https://github.com/monsterxx03/vim-conf

Conflicts:
	vimwiki/index.wiki
update