Remove bogus header file
minor ceanup
rearrange some of the code
Fix the crazy agent-finder stuff
Merge pull request #620 from linas/pyclean

try to fix the buildbot break