set html and add some ignores
Merge branch 'master' of github.com:jede/dotfiles

Conflicts:
	vim/vimrc.before