added some color stuff for TMUX
getting rid of xterm in TMUX
deleted some stuff
256 to 16
Merge branch 'master' of github.com:michaelghinrichs/.dotfiles

Conflicts:
	tag-osx/zshrc
	vimrc