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

* 'master' of github.com:redguardtoo/emacs.d:
  js2-mode snippet
  upgraded js2-mode and evil-mode
  js2-mode tricks
  autopair is buggy under css-mode and scss-mode
  use helm and its plugins
  eim words
  jsp use nxml-mode