minor changes to makeForecast.
fixing merge errors.

Merge branch 'master' of github.com:nickreich/dengueForecastPipeline

Conflicts:
	makeForecast.R