Merge branch 'issue42_rebranding'
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 branch 'issue53_durack1_TAS_units_hardcode'
Merge pull request #66 from durack1/master

removed hard-coded TAS unit conversion