sync with numpy's builtin: diagflat
sync with numpy's builtin: diag
Update comment: diag
fix itembase_collab, lda, naive_bayes apps
add retile operator
Merge pull request #195 from MaggieQi/master

fix itembase_collab, lda, naive_bayes apps
Merge branch 'master' of git://github.com/GabrielWen/spartan into GabrielWen-master

Conflicts:
	spartan/expr/builtins.py
Merge branch 'GabrielWen-master'
Rewrite fuzzy_kmeans by using built-ins only.
Merge remote-tracking branch 'upstream/master'
Add power API
Merge pull request #196 from fegin/master

Get workers' log back
Merge remote-tracking branch 'upstream/master'