tmux changed prefix key
force zshrc to source zshenv
xinit sets TERM, turned off some un needed scripts
fixed merge conflicts