Remove checking for tmux/screen sessions (more annoying than anything).  Remove trap to clear screen colours (breaks git).