Merge branch 'master' into single_code_base

Conflicts:
	sympy/liealgebras/cartan_type.py
Port sympy/liealgebras/type_b.py