Combine after-load blocks
Only enable js2-mode's syntax checking if flycheck can't do it
Merge remote-tracking branch 'upstream/master'