Cleaned up .zshrc

Conflicts:
	.zshrc
Copy from tmux mac is back
Added some snippets
Removed dumb copy thing again
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zshrc
Merged osx branch with all kinds of new goodness
Merge remote-tracking branch 'origin/master'
No idea
Merge branch 'osx'
Merge branch 'osx'

Conflicts:
	.vim/bundle/vim-surround
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim/bundle/vim-surround
override cd????
Merge remote-tracking branch 'origin/osx' into osx