html support
Merge resolution
Submodule updates
Ultisnips move forward
Merge with origin