Merge pull request #1 from sympy/master

11/12/14 sync