updated web-mode
Merge branch 'master' of github.com:DarrenN/prelude

* 'master' of github.com:DarrenN/prelude: (157 commits)
  Enable which-function-mode for all major modes
  Allow enable/disable global helm key bindings
  Flat index with python imenu
  Improve Helm configuration
  Use anzu for query-replace
  Fixed some mistakes in README
  Added some forgotten keys to README
  Added M-X to README [Close #621]
  Update documentation and tips for projectile keys
  Insert magic encoding comment upon save
  Automatically newline with block start
  Turn on electric indent mode with python mode
  Remove two keybinding tips concerning Super
  Remove the documentation for the <s-g> keybinding
  Remove the documentation for the <s-x> keybinding
  Fix Markdown escaping of backslash character.
  Delete documentation for C-M-h keybinding
  Associate .elixir files with elixir-mode
  added php-mode snippets and php modes to shibuya
  Redefine C-c C-s to run utop
  ...