Fixed up the floor/loc listing for buildings to be generated by bin_def
Patched up the merge conflicts for programmatically generating pages from bin_def.