A bug fixed
A Bug fixed
Merge pull request #2307 from pernici/pr1

solving quadratic congruences
test cases now have dimensional parameter, so they can later be re-used for dimensional regularization tests.
Minor changes
1] Fixed a bug (removed factorial)
2] Added a few more tests
Merge branch 'master' into Diophantine_Equation_Module_II to get Pernici's
work.
Use sqrt_mod() from Pernici's work
Skip the test in test_failing_integrals that is too slow for @slow

This test never finishes (or at least, it would probably take days), so
without a timeout, the slow tests don't complete. This was causing the slow
tests to timeout in the NiPy buildbot
(http://nipy.bic.berkeley.edu/builders/sympy-py2.6-32/builds/0/steps/shell_4/logs/stdio).
Merge branch 'master' into preview_bytesio

Conflicts:
	sympy/interactive/printing.py
Merge pull request #2417 from asmeurer/travis-sage

Run Sage tests in Travis
Merge pull request #2314 from skirpichev/unxfail-wester-H3

UnXFAIL Wester test H3
sqrt_mod() used
some more comments
Add some more tests.
A couple small fixups.
Use \, to separate the integration variable.
Whitespace fixes.
Doctests fixed
Made the changes proposed by Stephen
Merge master