Merge branch 'pcmdi_master'
Fix #77 - Update all CMIP5 jsons: amip, hist, piControl
Merge pull request #177 from durack1/issue77_durack1_AddCMIP5JsonDicts

Issue77 durack1 add cmip5 json dicts
Merge branch 'pcmdi_master'
Fix #109 - Added doc/parameter_files subdir; Also added piControl json install
Merge pull request #178 from durack1/issue109_durack1_CreateDocParamFilesSubdir

Issue109 durack1 create doc param files subdir

@gleckler if you update your CMIP5 amip/hist/piControl parameter files into the doc/parameter_files subdir in the repo, these will get copied into doc/parameter_files upon installation
Merge branch 'pcmdi_master'
Fix #77 - Add parameter file used to generate CMIP5 jsons
Merge pull request #180 from durack1/issue77_durack1_AddParamFile

Issue77 durack1 add param file
Fix #179 - Added test subdir creation back into setup.py, this was lost in #153
Merge pull request #181 from durack1/issue179_durack1_PutBackTestDir

Fix #179 - Added test subdir creation back into setup.py, this was lost ...

As noted @doutriaux1 it would be great for you to take a look at this when you're back
Fix #108 - Updating README.md and wiki pages
Further text tweaks
Further text tweaks
Further text tweaks
Merge pull request #182 from durack1/issue108_durack1_UpdateReadmeDotTxt

Issue108 durack1 update readme dot txt
Merge branch 'pcmdi_master'
Fix 108 - Further tweaks
Further tweaks
Fix #184 - Adding ACME portrait plot demo script