sync with numpy's builtin: diagflat
sync with numpy's builtin: diag
Update comment: diag
Merge branch 'master' of git://github.com/GabrielWen/spartan into GabrielWen-master

Conflicts:
	spartan/expr/builtins.py
Merge branch 'GabrielWen-master'