Most of the way towards two info panes

Also upgraded to mapbox.js 1.6.1