minor fixes
Merge branch 'master' of https://github.com/simvisage/simvisage.git
fixes for canopy