build
merge fix

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

Conflicts:
	modules/data.atmosphere/R/raw.NARR.R