Add .tmux.conf and .zshrc
Merge branch 'master' of github.com:jtwp470/dotfiles

Conflicts:
	mac/.zshrc