Pulling osx zsh settings into osx branch
Merge branch 'master' into osx
Iterm update
Updates readme
Merge branch 'master' into osx
Update README.md
Removes zshrc switch for osx and debian
Merge commit '9092b26'
Ignores bad ssl. Causes issues on some servers
tmux updates
Merge branch 'master' into debian

Conflicts:
	iterm/com.googlecode.iterm2.plist
	tmux.conf
	zsh/aliases
	zsh/paths
	zshrc
Merge branch 'master' of github.com:kevincolyar/dotfiles
Removes unsupported features
git, tmux, and zsh updates
Merge branch 'master' into debian

Conflicts:
	tmux.conf
Merge branch 'debian' into debian-dreamhost