Merge remote-tracking branch 'upstream/next' into speed, unfix "fixed" version

By "fixed", I mean "screwed up, not at all following the correct version
number, and refusing to ask on Gitter what the correct version really is, and
just assuming the wrong version despite hints all over the source screaming
'THIS IS THE CORRECT VERSION, YOU STUPID IDIOT!!!'".

I feel that should be a relatively accurate explanation of the mistake I made
while working on this patch (the specific commit that introduced it was
squashed in rebasing, and another commit was easier than a revert, since the
one that introduced it also entailed a few other things).

Gruntfile.js

@@ -1,6 +1,6 @@
 module.exports = function(grunt) {
 	var _ = require("lodash");
-	var version = "0.4.0";
+	var version = "0.2.0";
 
 	var inputFolder = "./docs";
 	var tempFolder = "./temp";

mithril.js

@@ -1,5 +1,6 @@
 var m = (function app(window, undefined) {
 	"use strict";
+  	var VERSION = "v0.2.0-next";
 	function isFunction(object) {
 		return typeof object === "function";
 	}
@@ -30,6 +31,9 @@ var m = (function app(window, undefined) {
 
 	initialize(window);
 
+  m.version = function(){
+    return VERSION;
+  };
 
 	/**
 	 * @typedef {String} Tag

tests/mithril-tests.js

@@ -2,6 +2,7 @@ function testMithril(mock) {
 	m.deps(mock)
 
 	//m
+  test(function() {return m.version().constructor === String})
 	test(function() {return m("div").tag === "div"})
 	test(function() {return m(".foo").tag === "div"})
 	test(function() {return m(".foo").attrs.className === "foo"})