Fix wrong charset recognition.
Merge branch 'master' of github.com:shuhei/dotfiles

Conflicts:
	.vimrc