update .vimrc
Merge branch 'master' of github.com:MidTin/vim

Conflicts:
	.vimrc
add emmet-vim.