Added functionality for retrieving data in JSON format
Fixed issue where geolocations would not be shown.
Cleaned up config file
Added JSON Api
Merge pull request #7 from Rhinofly/master

merge from master