Merge pull request #1 from PCMDI/master

merge latest changs back into Paul master
Updated to exclude test_portrait subdir
removed hard-coded TAS unit conversion
Merge pull request #65 from durack1/issue53_durack1_TAS_units_hardcode

Issue53 durack1 tas units hardcode