Merge pull request #632 from jhamman/develop

sync develop and master branches, reset version strings after 5.0.0 release

Author: yixinmao

docs/Development/ReleaseNotes.md

@@ -15,7 +15,14 @@ To check which release of VIC you are running:
 
 ------------------------------
 
-## VIC 5.0.0 [![DOI](https://zenodo.org/badge/7766/UW-Hydro/VIC.svg)](https://zenodo.org/badge/latestdoi/7766/UW-Hydro/VIC)
+## VIC 5.0.1
+
+**Release date: (Unreleased)**
+
+
+------------------------------
+
+## VIC 5.0.0 [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.61422.svg)](http://dx.doi.org/10.5281/zenodo.61422)
 
 **Release date: (September 2, 2016)**
 

vic/drivers/python/setup.py

@@ -25,10 +25,10 @@
 
 MAJOR = 5
 MINOR = 0
-MICRO = 0
+MICRO = 1
 ISRELEASED = True
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
-QUALIFIER = ''
+QUALIFIER = '(unreleased)'
 
 FULLVERSION = VERSION
 write_version = False

vic/drivers/shared_all/include/vic_version.h

@@ -31,11 +31,11 @@
 #define STR(x) STR_HELPER(x)
 
 #ifndef VERSION
-#define VERSION "5.0.0 September 2, 2016"
+#define VERSION "5.0.1 (Unreleased)"
 #endif
 
 #ifndef SHORT_VERSION
-#define SHORT_VERSION "5.0.0"
+#define SHORT_VERSION "5.0.1"
 #endif
 
 #ifndef GIT_VERSION