Merge branch 'master' of github.com:bbatsov/prelude

# By Bozhidar Batsov
# Via Bozhidar Batsov
* 'master' of github.com:bbatsov/prelude:
  Use prelude-require-packages everywhere
Merge branch 'master' of github.com:bbatsov/prelude

* 'master' of github.com:bbatsov/prelude:
  Improve prelude-eval-and-replace
  Enable browse-kill-ring's default keybindings
  Updates key chord bindings.
  Adds comments to sample modules.
  Add browse-kill-ring package
  Improve tab's behavior
  Add wrapping commands to ielm-map
  Simplify sexp wrapping code
  [Fix #433] Disable problematic binding M-[
  Fix epl-upgrade invocation
  Add prefix arg support prelude-update-packages
  Fix typo in prelude-ido
  [Fix #451] Add the ability to preload personal code
  [Fix #447] Extract ido config into a module
  New keychord xx -> execute-extended-command
  [Fix #444] Add command prelude-update-packages
Merge branch 'master' of github.com:letronje/emacs.d

* 'master' of github.com:letronje/emacs.d:
  Fixed indentation level for php mode to 2
  Fixed js indentation level to 2
  Removed yansippet and added php-mode
  Configured ag to highlight matches in result buffer
Don't use C-x SPC as it's used in Emacs 24.4 by default for rectangular selection
Merge branch 'master' of github.com:letronje/emacs.d

* 'master' of github.com:letronje/emacs.d:
  Some more custom conf
Merge branch 'master' of github.com:bbatsov/prelude

* 'master' of github.com:bbatsov/prelude:
  Don't use C-x SPC as it's used in Emacs 24.4 by default for rectangular selection