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

* 'master' of github.com:redguardtoo/emacs.d:
  flyspell in js2-mode
upgrade company-mode
use subword-mode
make company-mode compatible with evil-mode