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

Conflicts:
	vimwiki/index.wiki