Change bashrc to use new style test, ifs throughout

Let's see if this will sort out the problem of shell init leaving behind
an exit status of 1.