Lots of tweaking on diagnose, basic bug fixes
Better README and small PEP8 fixes
Fixed some errors introduced in refactoring

Also cleared cache
Merge pull request #3 from andrew-w-sherman/master

Reworked and simplified diagnose and updated README