Lots of changes to improve performance; disabled vim-javascript