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

* 'master' of github.com:redguardtoo/emacs.d:
  upgraded company-mode
  remove custom-set-variables
  right way to enable company-mode
  init-fill-column-indicator disabled
Merge branch 'master' of github.com:redguardtoo/emacs.d

* 'master' of github.com:redguardtoo/emacs.d:
  enable nxml-mode for jsp and tag
  change hot key for compile
  add warning into README
company-mode bug