[vim] html5
Merge branch 'vim' of github.com:hell0again/oreore_rc into vim

Conflicts:
	init.sh
	vim/vimrc7
	vim/vimrc_neobundle