deleted the comments and put the callback back on in map_box.js
Testing is back. Yo.
Merge conflict fixéd
Only calls back when there's a callback. When there is no callback then there ain't no hollerback. Girl.
upload events test fixed
modified test json file
resolving minor merge conflict in mapbox.js
merge conflicts in mapboxjs and Australia json