Merge remote-tracking branch 'upstream/dev_5.0' into dev_5.0

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Removed RCS $Id$ string

Each VIC release already has an version ID string that can be accessed
by the user by using the '-v' commandline option.

Developers can use 'git describe' to get detailed information about the
release they are using. The $Id$ was redundant.
Merge pull request #122 from bartnijssen/dev5/issue_107

Dev5/issue 107
Merge branch 'master' into dev_5.0

Conflicts:
	src/ChangeLog
	src/global.h
	src/runoff.c
Merge branch 'develop' into dev_5.0

Conflicts:
	src/ChangeLog
	src/Makefile
	src/calc_veg_params.c
	src/display_current_settings.c
	src/dist_prec.c
	src/free_dist_prcp.c
	src/global.h
	src/initialize_new_storm.c
	src/make_dist_prcp.c
	src/penman.c
	src/runoff.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Merge branch 'bartnijssen-dev_5.0' into dev_5.0
Merge branch 'develop' into dev_5.0

Conflicts:
	src/redistribute_during_storm.c
Merge pull request #151 from bartnijssen/dev_5.0

remove redistribute_during_storm.c
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