Simplify HISTCONTROL
Move shopt's together
Minor color prompt logic improvements

Add check for Gnome terminals COLORTERM variable
Combine simplify if-statements