fix html and js indent bug
Merge branch 'master' of https://github.com/piboye/vimrc

Conflicts:
	.vimrc