Merge remote-tracking branch 'refs/remotes/bbatsov/master'

* refs/remotes/bbatsov/master: (46 commits)
  Always auto-skip closing pair
  Disable ido's annoying auto-merging of directories if no match is found
  Fixed username (in windows-nt) in the final message after loading prelude.
  Fix issue disabling white-space-mode.
  Adds web-mode and prelude module.
  Username fix for windows-nt
  Remove solarized-theme from the list of default packages
  More tips
  Refine fullscreen support
  Restrict fullscreen feature to X-based systems.
  Add command to make Emacs window fullscreen.
  Add commands to increment and decrement an integer at point
  Rename prelude-add-comment-annotations to prelude-font-lock-comment-annotations
  Cleanup comment annotation highlighting a bit
  Fix command name
  Add a few more tips
  Clean up package installation code
  Update keybindings a bit
  Revert "flx-ido does not exist but flx does"
  Remove a problematic keybinding
  ...
Merge remote-tracking branch 'refs/remotes/bbatsov/master'

* refs/remotes/bbatsov/master:
  Add new command prelude-youtube
  Set properly smartparens's default keymap
  Auto-install puppet-mode
  Ignore .cask
  Make "C-x C-m" a true alias for M-x by binding it to smex.
  Clean up updated prelude-open-with
  open file in new session, new process

Conflicts:
	.gitignore
Merge branch 'master' of github.com:driftcrow/prelude

* 'master' of github.com:driftcrow/prelude: (60 commits)
  remove paredit and change osx for meta key
  Fix a reference to nrepl.el
  [Fix #399] Extract key-chord into a separate module
  Extract Helm support into a separate module
  Remove obsolete markdown module
  Code style
  Remove obsolete dep to git-commit-mode
  Cask files are Emacs Lisp files
  [Fix #426] Remove M-O keybinding
  Add a table of contents
  Add period.
  Really fix key bindings, once and for all.
  Add M-O and s-o as key bindings for prelude-smart-open-line-above.
  [#421] Bind prelude-smart-open-line-above to M-O
  Fix README key binding for prelude-smart-open-line-above.
  Do an automatic package upgrade in prelude-update
  Fix a typo in function name
  recompile elc instead of removing it when saving elisp file
  Use correct hook for el-doc
  Define a few basic wrapping keybindings
  ...
change prelude-modules
Merge branch 'master' of github.com:driftcrow/prelude

* 'master' of github.com:driftcrow/prelude:
  remove nrepl use cside in prelude,add python highlight indent line
  clean some package (nrepl...),fix binding
  [Fix #436] Enable smartparens-mode in latex-mode
  [Fix #416] Add quotes to the alias examples
  Fix key-chord module commentary.
  Replace mentions of WikEmacs with EmacsWiki
  Some minor changes in yank-pop
  change prelude module loaded

Conflicts:
	prelude-modules.el