Quality check in cds.py
Resolves merge conflicts
Changes in cds_cancel_tan

Conflicts:

	sympy/integrals/rde.py
Raises NotImplmentedError for hypertangent cases

Conflicts:

	sympy/integrals/tests/test_risch.py

Conflicts:

	sympy/integrals/tests/test_risch.py
All