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

* 'master' of github.com:redguardtoo/emacs.d: (31 commits)
  command to convert multiple lines into one line
  restore C-e to move-end-of-line
  fixed: typo in coffee-mode
  snippets for js-mode
  jasmine it
  sunrise sometimes could be annoying
  upgraded helm
  company-mode bug
  enable nxml-mode for jsp and tag
  change hot key for compile
  add warning into README
  upgraded company-mode
  remove custom-set-variables
  right way to enable company-mode
  init-fill-column-indicator disabled
  use company-mode instead of auto-complete mode
  upgraded expand-region and org
  hotkeys to comment lines
  more natural dired operation
  video handler
  ...
updated REAME for Mainland Chineses