Use utf-8 encoding
Merge branch 'master' of github.com:clinstid/vimfiles

Conflicts:
	.vimrc