Merge branch 'master' into milestone/2.x.x

src/bin/grin.rs

@@ -71,7 +71,9 @@ fn main() {
 
 fn real_main() -> i32 {
 	let yml = load_yaml!("grin.yml");
-	let args = App::from_yaml(yml).get_matches();
+	let args = App::from_yaml(yml)
+		.version(built_info::PKG_VERSION)
+		.get_matches();
 	let node_config;
 
 	// Temporary wallet warning message

src/bin/grin.yml

@@ -1,5 +1,4 @@
 name: grin
-version: "2.0.0"
 about: Lightweight implementation of the MimbleWimble protocol.
 author: The Grin Team