Merge commit '6d6caf8bbd82fec5341f45af1c4f201f989e88bc' into master_bak

* commit '6d6caf8bbd82fec5341f45af1c4f201f989e88bc': (29 commits)
  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
  use diffmerge as mergetool for git
  set tab size of php & twig to 4
  add several useful vim commands
  ...

Conflicts:
	git/gitconfig
	zsh/prezto
	zsh/theme.zsh
set indent 4 spaces in xml files
Changed tab size for several file types
Don't autoload session
Added PHP debug via DBGPavim