WIP - Locations perf

Attempting to fix the pain on the first page of the Orion CMS by reducing the amount of JSON consumed and trips the server. 

https://www.pivotaltracker.com/story/show/78577940
When we're ready to ship, let's be sure to get rid of all these commented out specs...