Set TERM based on COLORTERM
Set TERM based on COLORTERM
Clean up user-config.jam