Added setup-term to set TERM.
Merge branch 'master' of git://github.com/the9000/dotfiles