Add Emmet.vim
Merge branch 'master' of https://github.com/zhlsky/vim-settings

Conflicts:
	vimrc

	Changed settings
Changed settings.