Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Implemented historical time series of veg parameters (LAI, albedo).
Added historical time series of partial veg cover fraction.
Merge branch 'master' into develop

Conflicts:
	src/ChangeLog
	src/global.h
	src/runoff.c
Merge branch 'feature/veg_hist' of https://github.com/tbohn/VIC into tbohn-feature/veg_hist

Conflicts:
	src/ChangeLog
	src/global.h
	src/runoff.c
Merge branch 'tbohn-feature/veg_hist' into develop
Merge branch 'feature/vegcover' of https://github.com/tbohn/VIC into tbohn-feature/vegcover

Conflicts:
	src/global.h
Merge branch 'tbohn-feature/vegcover' into develop
remove ARC_SOIL and SOIL_DIR from global.param.sample

fixes #120
Minor bugfix - bare soil evap wasn't being reported correctly in put_data.
Merge pull request #130 from tbohn/feature/update_to_vegcover

Minor bugfix - bare soil evap wasn't being reported correctly in put_data.
Fixed bug in reading state file when skipping cells.

When dist_prec was removed, I neglected to remove a related line in read_initial_model_state.c that assumes (when skipping over inactive cells) that dist_prec parameters occupy 1 line per veg tile in the state file.  This resulted in VIC not being able to read a state file if it had to skip inactive cells.  This has been fixed.
Merge pull request #131 from tbohn/feature/fix_read_initial_model_state

Fixed bug in reading state file when skipping cells.
reconcile lapse rates for penman and snow bands

fixes #32
Merge pull request #132 from jhamman/feature/fix_lapse_rates

reconcile lapse rates for penman and snow bands. T_LAPSE is now expressed in degrees / m (rather than per km) and LAPSE_PM is removed.
Fixed allocated type for tmaxhour and tminhour
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/display_current_settings.c
Fixed allocated type for tmaxhour and tminhour
Merge pull request #136 from bartnijssen/feature/issue_135

Fixed allocated type for tmaxhour and tminhour
fixes #135
initial backport of print_library