test
fix
changes

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

Conflicts:
	utils/R/convert.input.R
added host as psql-pecan
added host as psql-pecan
adding all met2cf.NARR files
Merge branch 'master' of github.com:bcow/pecan
update
put var nc files in folder (may delete them eventually)
Adding random scripts that shouldn't be pushed to main line
update
new test
update
update
Merge branch 'master' of github.com:bcow/pecan
ready for 1st test
ready for 1st test
Merge branch 'master' of github.com:bcow/pecan

Conflicts:
	utils/R/convert.input.R
fixing merge issues
update