html indent to 2
Merge branch 'master' of github.com:greatghoul/vimfiles

Conflicts:
	.vimrc