added knitr to dependencies in order to support .Rmd vignettes
Merge branch 'biocro-module' of github.com:PecanProject/pecan
Changing name of package PEcAn.ED to PEcAn.ED2 for consistency
Merge branch 'rename-pecan.ed' of github.com:PecanProject/pecan
renaming package and updating tests in PEcAn.ED2
renamed run.template.ED2
added test files, updated tests

Merge branch 'master' into rename-pecan.ed

Conflicts:
	models/ed/inst/tests/test.model2netcdf.ED2.R
removed changes to biocro module from branch
removed changes to biocro module from branch
Merge branch 'rename-pecan.ed' of github.com:PecanProject/pecan into rename-pecan.ed
removed tests of PEcAn.BIOCRO; these will be fixed on branch biocro-module
Merge branch 'master' of github.com:PecanProject/pecan
Merge branch 'master' of github.com:PecanProject/pecan
Merge branch 'master' of github.com:PecanProject/pecan
compiling pecan on mac
fix for date for mac
remove log output
create var file to not have to use complex ncdump
use ncdf4, if no Y file found use hardcoded values.
only print if R_LIBS_USER is not set