use cleaner VERSION detection
fix setup py -- that change belonged to a different branch