Revert some stuff that got stomped on.
Update the way we are testing for guest accounts.

Now that we are allowing more than 1 guest account this needed updating.
There is probably more work to do here but this is a good start.
Merge branch 'master' of github.com:sirdude/gurbalib