BUG: allow .moment to take shapes as keywords.
BUG: allow also rv_discrete.moment to take shape as keywords.

Also fix a test issue for moment() in the continuous tests.
Merge branch 'moment' into master.

Contains relevant commit of https://github.com/scipy/scipy/pull/2753 and an
extra bugfix.