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