Reboot .vimrc
Update .vimrc
Simplify .vimrc
Add vim ragel syntax
Updated emacs config
Remove plugins from .vimrc
Update vim indentation settings
Vimrc update
Update .zshrc
Merge branch 'master' into back-to-basics

* master:
  Update .zshrc
  Vimrc update
  Update vim indentation settings
  Remove plugins from .vimrc
  Updated emacs config
  Add vim ragel syntax
  Simplify .vimrc

Conflicts:
	.vimrc
Update .vimrc
Add pathogen