add DiagonalMatrix expression

Conflicts:

	sympy/matrices/__init__.py
	sympy/matrices/expressions/__init__.py
add DiagonalOf

Conflicts:

	sympy/matrices/__init__.py
	sympy/matrices/expressions/__init__.py