pyparsing 2.0 no longer supports python 2, 1.5.7 is the last version
that does.
use the most recent sympy version for testing
Merge remote-tracking branch 'origin/master' into sphinxext_improvements

Conflicts:
	.travis.yml