Merge pull request #1 from drakedevel/master

Add JSON output mode, and fix all lint errors in main.py.