Fixing conditional env load.  Adding bash logout for laptop.