updated for hg and git to work
Merge branch 'devel' of https://github.com/toeb/cps into devel