Removing the zenconding folder
user + email
Removing the indexed search folder
Revert "user + email"

This reverts commit 378e4df74f65e47ca032efa84845c13ec21f043c.
Merge branch 'master' of git://github.com/skwp/dotfiles

* 'master' of git://github.com/skwp/dotfiles: (61 commits)
  Replaced honza/snipmate-snippets with honza/vim-snippets since it seem upstream changed name
  Fix a bug that was causing .vim.after to be removed after update
  Revert "Add support for sourcing the right rvm env on bufenter"
  Added @duhanebel to contributors list
  Remove csapprox from the README
  Add support for sourcing the right rvm env on bufenter
  Add tpope/vim-rvm to the plugin list
  Fix setting of Gsearch to silver searcher ag
  Remove bogus bundle
  Fix path to file-line bundle
  Added changelog
  Install latest zsh from brew
  Add back file-line after undle migration
  Fix missing path to promptinit
  Use silver searcher for lightning fast :Gsearch
  Remove "press a key to continue" before vundle_install
  Fix a bug preventing the correct update of vim
  Updated README to describe new user Git configuration.
  Added support for git user configuration. Gitconfig will now include the configuration from ~/.gitconfig.user, if it exists. The include is done at the end of gitconfig, so that it can override any of the default values.
  New: [VIM] added file-line plugin. Allows to open file and move to certain line like this vim Rakefile:110
  ...
Merge branch 'improved-semicolon-insertion'

* improved-semicolon-insertion:
  Improving semicolon insertion at the end of the line
Merge branch 'visual-star-search'

* visual-star-search:
  Adding visual star search vundle
Merge branch 'visual-star-search'

* visual-star-search:
  Updating the readme with the visual star search plugin
Updating repository references in the readme
Merge branch 'visual-star-search'

* visual-star-search:
  Fixing typo in the readme
Adding mustache support
Merging upstream
Adding *.template as a mustache's filetype
Making tab=4 spaces
Merging upstream
Line numbering on by default