Added vimwiki back in (again)
Merge branch 'master' of github.com:roblund/dotvim

Conflicts:
	.vimrc