Added auto completion and emmet tab function
Merge branch 'master' of github.com:alanmulhall/dotfiles

Conflicts:
	.vimrc