simplify caldav oauth options further
Simplify conventions to be more general to OAuth2 rather then google.
Streaming fixes