Update to climate master

Hi Kim,
This pull request updates your mccsearch branch in line with master branch.
It also includes the other changes I proposed a while  back.
You can merge this directly and there will be no issues with the merge.
We can talk through this on Monday via a GHangout hopefully.
We can then begin testing and validating that things are working as we hope they should!
Have a great weekend Kim.
Thanks
Lewis