Incoporate changes from pull request 12
Merge branch 'master' of https://github.com/tomtom/viki_vim

s/inexistent/nonexistent/

Conflicts:
	README
	doc/viki.txt
Merge