fix handling of global virtenv
fix comment
fix comment
simplify VE cleanup logic
Merge branch 'master' into devel
work on gordon