add emmet
Merge branch 'master' of github.com:thomaspeklak/vim-config

Conflicts:
	bundles.vim