Merge branch 'master' of github.com:PecanProject/pecan

Conflicts:
	modules/data.atmosphere/DESCRIPTION
	modules/data.atmosphere/NAMESPACE
	modules/data.atmosphere/R/met2CF.NARR.R
small changes to workflow parameters

Merge branch 'master' of github.com:bcow/pecan

Conflicts:
	modules/data.atmosphere/DESCRIPTION