fix #122 - Corrected upper level dir name from CMIP5 to CMIP
fix #122 - updated setup.py to deal with new directory structure
fix #122 - updated test_portrait.py to deal with new directory structure for json files
Merge branch 'issue122_durack1_Rename_CMIP_results_subdir' into issue70_durack1_create_obs_sftlf_masks_and_scripts