Added notes subdirectory to gitignore
Fixed typos in EXCESS_ICE code that prevented compilation.
Removed ARC_SOIL option including tool to create parameter files. Closes issue #71
Merge remote-tracking branch 'upstream/develop' into develop
Revert "Added notes subdirectory to gitignore"

This reverts commit bc00d473bccd2d5926d75b2a9f18d24474154a31.
Merge branch 'master' into develop
Merge branch 'master' into fix/issue_71
Deleted wgtpar.h. Closes issue #47
Removes calc_cloud_cover_fraction() in response to issue #81
Removes compute_dz() in response to issue #87
Removes unused functions in response to issue #88
Removed remove unused write_* functions in response to issue #89
Merge branch 'fix/issue_47' into develop
Merge branch 'fix/issue_71' into develop

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/read_soilparam_arc.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Merge branch 'fix/issue_81' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge branch 'fix/issue_87' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge branch 'fix/issue_88' into develop

Conflicts:
	src/vicNl.h
Merge branch 'fix/issue_89' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge pull request #96 from bartnijssen/fix/issue_87

Fix/issue 87
Merge pull request #98 from bartnijssen/fix/issue_47

Fix/issue 47