Remove dir for python
Add html comment snippet
Merge branch 'dev_html' into dev

Conflicts:
	UltiSnips/python.snippets
	UltiSnips/python/python.snippets
	python.snippets