Update ctrlp.vim
Removed bundle kogakure/vim-sparkup.git since the repo doesn't exist on github anymore
Merge pull request #390 from jby/fix_vim-sparkup

Removed bundle kogakure/vim-sparkup.git
Merge pull request #387 from maletor/patch-2

Update ctrlp.vim
Git snapshot: take a snapshot and stash it without messing with your working tree
Changed tab size for several file types
Don't autoload session
Merge branch 'master' into upstream_master

* master: (61 commits)
  Don't autoload session
  Changed tab size for several file types
  set indent 4 spaces in xml files
  comment out some unused options in osx script
  upgrade to ack 2
  no longer paginate pry output
  update prezto submodule
  remove submodules
  ignore rerun.txt
  ignore pow, rvm files
  do not vimify irb/pry
  does no show array indices
  fix vim configs link
  git lg show only 20 lines
  use my folk of prezto
  shorten pry prompt and add ss shortcut
  install vimrc.after, ackrc
  move php and twig extension plugin to correct directory
  add vimrc.after and remove duplicate config
  don't compile coffee script file automatically
  ...

Conflicts:
	git/gitconfig