Merged from grokzen after some tewaking.
Added a clean target
General clean-up.
Notes for future modifactions.
Fixed and added doctests.
Fixed python version.