adds vim-coffee-script, disables term, els should use html syntax
stree mergetool update