Now populating both gen and specific locs in sql

Renamed populate_genloc to populate_locs and added sql statements to
include specific locs