Add jslint to vim bundles.
Fix merging conflict.