Updating Locator to align with MapBox Sites

Locator will be demo'ed in [MapBox Sites](http://mapbox.com/map-sites/), so moving new refactor into the main Locator branch.