fix
encoding for vimrc
Merge branch 'master' of https://github.com/samuelchen/vim-dotfiles

Conflicts:
	install.sh