Update json
Cleaned up more .idea files
Merge pull request #2 from bradchamberlain/json

Json