Pre-merge commit.
Updated bundles.
Added vim-javascript.