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

* 'master' of github.com:redguardtoo/emacs.d:
  button snippet
  match html element in nxml-mode
  fixed indent typo in c++-mode
  js2-mode snippet
  upgraded js2-mode and evil-mode
  js2-mode tricks
  autopair is buggy under css-mode and scss-mode
helm-ls-git-ls hotkey
wassert snippet modified
eim words