Fixing JSON - JSONP bug
Added ability to load from multiple data sources for easier upgrades