Merge pull request #46 from pobocks/wrap_with_markup

Wrap with markup
Fix error when accepting the expansion.
Merge pull request #48 from XeCycle/master

Fix error when accepting the expansion.
Prospective emmet-mark-enclosing-tag functionality, depends on sgml-mode