Added carbon options to global.param.sample and fixed some typos in vicNl_def.h.
Added VEGLIB_VEGCOVER option.
Added missing options.
Merge pull request #157 from tbohn/develop

Added carbon options to global.param.sample
remove LOG_MATRIC option from sample global parameter file
Fix to water balance error in runoff.c.

Removed recalculation of layer[lindex].evap  -- fixes #147

Removed unused variables found along the way
Merge pull request #159 from jhamman/fix_wb_error

Fix to water balance error in runoff.c.
bump version string to 4.2.0 in global.h
Merge branch 'release/4.2.0'
Merge branch 'release/4.2.0' into develop
Merge remote-tracking branch 'upstream/dev_5.0' into develop

Conflicts:
	src/global.h
Merge branch 'master' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into feature/image

Conflicts:
	src/global.h