For newest Mac OSX, PS1 doesn't change

[wmleidy]

if [ $OSTYPE == 'darwin15' ] && ! [ $ITERM_SESSION_ID ]

needs to become

if [ $OSTYPE == 'darwin16' ] && ! [ $ITERM_SESSION_ID ]

and then it will work

[misternu]

That wouldn't work for el cap people then. Whatever it is we do, the semicolon needs to not be there for darwin<15 and linux by default, and then we do add the semicolon for those two exceptions, El Cap and Sierra. If we can figure out why Terminal started getting confused without the semicolon, and write a ps1 line for everybody, we can skip the boolean all together.