12/13/14 PD Merge

A merge to add updates to the functions needed for the 12/13/14 PD.