Pulled in the data and database dirs from master branch.

Want to clean up the data import stuff. Currently its split between
these directories, and between the work done to get data for the fusion
tables and the work done to get data into the db.