merged w/ master, some cleanup, updating re: some fcns now-supported on app engine

minor cleanup, plus (temp) patch for issue re: url-encoding the '@' in GCS pathnames

fix issue w/ session key change/logout etc. on app engine redeploy
mysterious merge conflicts