12-13-14 PD Merge (Round 2)

Updates to load_lab function and fixes to MakeMap.