+ emmet plugin
Merge branch 'master' of https://github.com/lejeunerenard/dotfiles

Conflicts:
	home/.vimrc