Unbreak line

Change-Id: Ia1d287d4c04744c57877281f393ba8ee267807bb
auth stuff: clean up, allow scheme registration, integrate App Engine auth.

Change-Id: Idc7ac3782d3669a8f68255bd54d03f583814d5e2