Merge pull request #1 from PecanProject/master

Update my branch of pecan with vm workflow.r fix
outline of met2CF function based on Ameriflux as Met to convert
Merge branch 'master' of https://github.com/jam2767/pecan
updates to connect to bety
added demo to BioCro
fixing bugs to get demo to work
minor formatting, fixing merge
updated BioCro demo

Merge branch 'biocro-module' of github.com:PecanProject/pecan into biocro-module

Conflicts:
	models/biocro/BioCro_demo.Rmd
	models/biocro/inst/extdata/misp.xml
debugged biocro demo; added use of model2netcdf.BIOCRO to end of biocro.Rscript
Merge branch 'master' into biocro-module
pointed globalbiocro.Rscript to inputs on biocluster
Merge pull request #102 from mdietze/master

Initial code for a convert.input function to wrap met conversions
fix tests, test to make sure var files are created
make sure site uses https to get googlemaps
replace <?= ?> shortcut for php with <?php echo ?> for ebi-forecast
Allow to specify path for R (only for workflow execution, not model2netcdf)
make sure to only locate inputs, not posteriors
Only return sites with matching inputs, not posteriors.
more fixes to get to work at ebi-forecast
use input in container_type #103