Update.
Changed vimrc.
Merge branch 'master' of github.com:rik0/riko-vim

Conflicts:
	vimrc