Hacks to get biocro running using csv output (rather than export to PEcAn's netCDF standard)
Update pecan.biocro.xml
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
pulling relevant updates from master
Merge branch 'rename-pecan.ed' of github.com:PecanProject/pecan
renaming package and updating tests in PEcAn.ED2
added sample data for biocro vignette
updated tests of PEcAn.ED package
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
updated tests of PEcAn.ED package
Merge branch 'master' of github.com:PecanProject/pecan

Conflicts:
	models/ed/inst/tests/test.model2netcdf.ED2.R
replaced 'hacked' files with versions from master (using diff + git checkout master <file>); also contains minor revisions and edits
merged master into  biocro-module branch
removed tests of PEcAn.BIOCRO; these will be fixed on branch biocro-module