Fix basepath logic to be correct in all JSONs

https://www.pivotaltracker.com/story/show/80743462