Fixed XOAuth2/Google Auth matcher (should fix #21)

This should resolve the issue #21 and avoid using OAuth2 unless it's specified.