Fixed(?) json script
Deleted old files
Ignored the generated file for CartoDB (in a location that it's not yet at)
Removed old PHP import script
finish merge
Merge pull request #1 from rnelson/busted

Busted