Continued work to get met2model.ED2 working with convert.input
Merge branch 'master' of github.com:bcow/pecan

Conflicts:
	modules/data.atmosphere/inst/scripts/met.workflow.NARR.R