sync with numpy's builtin: diag
Merge branch 'master' of github.com:GabrielWen/spartan