fixed minor pep8 issues
minor pep-8 cleanup
minor pep8 fixes
minor pep8 cleanups
Added parsable output, simplified unit testing, eliminated
unnecessary options