Code clean up; include latest version of mapbox source files