Merge branch 'bartnijssen-dev_5.0' into dev_5.0
remove redistribute_during_storm.c
Merge pull request #150 from jhamman/feature/no_dist_prec

remove redistribute_during_storm.c
Merge branch 'develop' of github.com:UW-Hydro/VIC into develop
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
Merge commit '1bd4f3fe88b22b8cff25be6addb7ccb42f02a1a2' into feature/image