Fix Python 3 doctest runner
doctest fix
Merge branch 'master' into single_code_base

Conflicts:
	sympy/solvers/ode.py
doctest fix
Update doctest print function to pass in Python 2
Update release/fabfile.py.
Re-add some functions and a docstring from master.
Add call to expand in add & sub, fix linear_expand.

Call expand early to identify cases where the expression reduces to zero.
Re-add galgebra tests from master.

A number of these tests are now failing, due to the vast changes
in the interface of many of the base classes inside galgebra. They
are added with @XFAIL and should be investigated individually.
Various docstring fixes to please Sphinx.
Update the Sphinx documentation for galgebra.
Adding tests to test_args
Merge pull request #2315 from skirpichev/misc

Misc small fixes
Merge pull request #2259 from meclark256/liealgebras_2

Liealgebras 2
Fixing things
Merge branch 'master' into single_code_base

Conflicts:
	sympy/liealgebras/cartan_type.py
Port sympy/liealgebras/type_b.py
Add comment on Python 2/3 compatibility fixes
Implement u_decode in compatibility, change from PY2 to PY3
Remove filter and callable from compatibility file