updates
updates.
Merge branch 'master' of https://github.com/hplgit/pyhpc

Conflicts:
	doc/src/project/src/numexpr_example.py