updated
commented out osx script
zshrc push
changed iterm info
Merge branch 'master' of https://github.com/dreckinger/dotfiles

Conflicts:
	com.googlecode.iterm2.plist
	osx
	zshrc
no modification
copied form other host
"always modified
"Added tmux pasteboard support"
updated zshrc