command-t: Remap keys due to conflicts
html5.vim: Switch to plugin and update

Haml files were throwing an error and the recommended fix was to update
html5.vim. It seems to have fixed the issue.