config update
Add tmux.conf
Merge branch 'master' of github.com:cutwater/dotfiles

Conflicts:
	zshenv