Merge branch 'master' of github.com:redguardtoo/emacs.d

* 'master' of github.com:redguardtoo/emacs.d:
  donot install js2-mode for emacs version < 24.1
  donot use js2-mode in elpa.
jsp use nxml-mode
eim words