code cleanup with help from Bastibe;some TODOs
Make it pretty
Merge branch 'master' of github.com:kousu/pyscope