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

* 'master' of github.com:redguardtoo/emacs.d:
  autoload undotree for right file
  js2-mode specific version gone
Merge branch 'master' of github.com:redguardtoo/emacs.d

* 'master' of github.com:redguardtoo/emacs.d:
  tweak .gitignore
  configure smartparens
  remove autopair
  snippets for java-mode
  snippet to log object in js-mode
  jsp-mode yasnippets
  ibuffer config
Merge branch 'master' of github.com:redguardtoo/emacs.d

* 'master' of github.com:redguardtoo/emacs.d:
  clipboard
  esc in evil-mode
  use legalese
tweak w3m for helm