html.snippets: fix typo.
add markdown.snippets.
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	UltiSnips/html.snippets
	UltiSnips/markdown.snippets