Merge branch 'master' of git://github.com/skwp/dotfiles

# By Yan Pritzker (44) and others
# Via Yan Pritzker
* 'master' of git://github.com/skwp/dotfiles: (129 commits)
  Remove lusty juggler / not using
  Add :ChangeHashSyntax for ruby 1.8->1.9 hashes
  follow presentation style
  adding brew update
  [Fix #311] zsh/presto gets "modified" after clean install
  Revert "Fix: dirty worktree after running 'rake install'"
  Highlight easymotion targets
  Fix: dirty worktree after running 'rake install'
  Update prezto
  Adds some missing links to the Readme
  Add the multicursor plugin
  Removes Swipe back/forth feature for Chrome
  Fix previous commit
  Fix a bug with installing new vim plugin from the command line
  Revert "Wrapping search. Perl regex while searching. Center search matches and jumps"
  Map ,t to CtrlP standard (not mixed) [Fix #333]
  Revert "Externalizing color scheme configs outside plugin folder" - screwed up command line vim
  Wrapping search. Perl regex while searching. Center search matches and jumps
  Disable Expose ( Mission Control ) Animations
  Cleaning vundles.vim
  ...

Conflicts:
	README.md
	git/gitconfig
	vim/bundle/sjl-gundo
	vim/bundle/skwp-vim-colors-solarized
	vim/bundle/skwp-vim-powerline
Merge branch 'master' of github.com:xvaara/dotfiles

# By Yan Pritzker (59) and others
# Via Yan Pritzker (27) and Jukka Raimovaara (1)
* 'master' of github.com:xvaara/dotfiles: (89 commits)
  Sneak: hit Space and type two letters to quickly jump somewhere
  Removed mapping; doesn't exactly work. You can still use Ctrl-R when in :ex mode
  Added Ctrl-R, reverse history search for :commands
  Fix docs
  Make 0 go to first character, making it easier to work with indented languages
  Remove ;; semicolon mapping. Messes with regular semicolon usage (find next char)
  Fix up settings for neocomplete
  fixed zpreztorc key-bindings
  Change to Lightline instead of Airline [Fix #418]
  Added support for js highlighting for jquery/other frameworks
  Fix syntastic deprecation
  Load correct fonts under GTK
  Go back to using neocomplcache; prematurely upgraded
  Install good version of MacVim with lua support
  Reorg bundles, add vim-vinegar and vim-grubox alternate colorscheme
  Removing outdated comment
  Make gf create the file if not existent
  Add zsh to standard shell list
  Update Homebrew install script
  Replace with neocomplete
  ...

Conflicts:
	.gitmodules
little cleanup