UltiSnips 3.0 and custom snippets.
More html snippets tweaks, and fix <leader>s for snippet editing.