fixed encoding.
Merge branch 'master' of github.com:asdfzxcv/dotfiles

Conflicts:
	.vimrc