Added coloring for killed jobs
Made rossetup script force grep to not use color
removed duplicate bash history options
Fixed aero ip address
Removed extra LANG export
Removed rossetup LANG export
Added detection of upstream branch to prompt (and symbol for no upstream)
Upgraded rossetup to indigo