durack1 bringing PCMDI up-to-date with durack1/master

@doutriaux1 just trying to clean up my own environment