fixed yasnippet and js2-mode issues
Merge branch 'master' into emacs24