first put it back on by default
Merge branch 'master' into issue_673_cmor_in_bld
Ok cmor is now optional and builds fine when turned on
Merge pull request #780 from UV-CDAT/issue_673_cmor_in_bld

Issue 673 cmor in bld