updated docs
updated docs
small updates
updated docs
Merge branch 'master' of https://github.com/swartn/cmipdata

Conflicts:
	docs/conf.py