Clean up make (again), working on github and topojson support