Initial setup for prezto
Updated install
view ain't workin so well
Updated .vimrc a lot
Removed vim surround
Merge remote-tracking branch 'origin/new-vim' into osx

Conflicts:
	.tmux.conf
	.vimrc
	.zshrc