Merge remote-tracking branch 'origin/rewrite' into rewrite

Conflicts:
	docs/keys.md
	docs/signatures.md
	docs/v1.x-migration.md
	index.js
	ospec/bin/ospec.cmd
	request/request.js
	request/tests/test-xhr.js
	util/prop.js
	util/tests/index.html
	util/tests/test-prop.js

examples/threaditjs/app.js

@@ -15,7 +15,7 @@ var api = {
 	home : function() {
 		T.timeEnd("Setup")
 		return request({method: "GET", url: T.apiUrl + "/threads/"})
-	}, 
+	},
 	thread : function(id) {
 		T.timeEnd("Setup")
 		return request({method: "GET", url: T.apiUrl + "/comments/" + id}).map(T.transformResponse)
@@ -87,7 +87,7 @@ var Header = {
 		return [
 			m("p.head_links", [
 				m("a[href='https://github.com/koglerjs/threaditjs/tree/master/examples/mithril']", "Source"),
-				" | ", 
+				" | ",
 				m("a[href='http://threaditjs.com']", "ThreaditJS Home"),
 			]),
 			m("h2", [
@@ -140,7 +140,7 @@ var Thread = {
 	view: function() {
 		if (current) T.time("Thread render")
 		return [
-			m(Header), 
+			m(Header),
 			current ? m(".main", {oncreate: function() {T.timeEnd("Thread render")}}, [
 				m(ThreadNode, {node: current.root})
 			]) : null
@@ -149,7 +149,7 @@ var Thread = {
 }
 var ThreadNode = {
 	view: function(vnode) {
-		return m(".comment", [		
+		return m(".comment", [
 			m("p", trust(vnode.attrs.node.text)),
 			m(".reply", m(Reply, vnode.attrs)),
 			m(".children", [

examples/threaditjs/colors.css

@@ -3,4 +3,4 @@ html {background-color:#f5f5f5;}
 a {color:#161;text-decoration:none;}
 a:hover {text-decoration:underline;}
 
-input[type=submit] {background-color:#5A5;color:#fff;border:0;font-weight:bold;}
+input[type=submit] {background-color:#5A5;color:#fff;border:0;font-weight:bold;}

examples/threaditjs/index.html

@@ -22,4 +22,4 @@
 		<script src="../../request/request.js"></script>
 		<script src="app.js"></script>
 	</body>
-</html>
+</html>