Merge branch 'pcmdi_master'
Merge branch 'pcmdi_master'
fix #122 - rename CMIP_results to data
fix #70 - create obs sftlf masks and drop scripts in src_misc subdir
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'
Cleaned up duplicate directories
Updating CMIP_metrics_results
Merge branch 'issue122_durack1_Rename_CMIP_results_subdir' into issue70_durack1_create_obs_sftlf_masks_and_scripts
Merge branch 'issue70_durack1_create_obs_sftlf_masks_and_scripts'
Merge branch 'pcmdi_master'
Merge branch 'master' of github.com:durack1/pcmdi_metrics

Conflicts:
	setup.py
Bringing local up-to-date with remote master
Merge branch 'pcmdi_master'
merge branch pcmdi_master
fix #163 - adding GFDL demo scripts
Cleaned up duplicate files in misc src subdir
Merge pull request #164 from durack1/issue163_durack1_GFDLDemoScripts

Issue163 durack1 gfdl demo scripts - @doutriaux1 this shouldn't affect anything, so self-merging