Merged: Cds & is_deriv

Merges the following branches:

 -> is_deriv: https://github.com/sympy/sympy/pull/2191
-> cds : https://github.com/sympy/sympy/pull/2185