moved to rest data where feasible
added arcgis.com to proxy
Merge pull request #331 from NICTA/esri-fixes

moved to rest data where feasible