Merge branch 'next' into es6-promise

Conflicts:
	docs/mithril.deferred.md

docs/change-log.md

@@ -13,6 +13,7 @@
 
 -	gracefully degrade on IE exceptions when setting invalid values
 -	fixes for Typescript definition file
+-	fixed bug in keys algorithm when mixing keyed and unkeyed elements [#246](https://github.com/lhorie/mithril.js/issues/246)
 
 ---
 

docs/components.md

@@ -99,7 +99,7 @@ autocompleter.controller = function(data, getter) {
     this.change = function(value) {
         this.value(value);
 
-        var list = value === "" ? [] : data.filter(function(item) {
+        var list = value === "" ? [] : data().filter(function(item) {
             return this.getter(item).toLowerCase().indexOf(value.toLowerCase()) > -1;
         }, this);
         this.data(list);
@@ -130,7 +130,7 @@ var dashboard = {}
 
 dashboard.controller = function() {
     this.names = m.prop([{id: 1, name: "John"}, {id: 2, name: "Bob"}, {id: 2, name: "Mary"}]);
-    this.autocompleter = new autocompleter.controller(this.names(), function(item) {
+    this.autocompleter = new autocompleter.controller(this.names, function(item) {
         return item.name;
     });
 };

docs/mithril.deferred.md

@@ -119,7 +119,7 @@ var greetAsync = function() {
 
 ### Differences from Promises/A+
 
-For the most part, Mithril promises behave as you'd expect a [Promise/A+](http://promises-aplus.github.io/promises-spec/) promise to behave, but they have a few differences.
+For the most part, Mithril promises behave as you'd expect a [Promise/A+](http://promises-aplus.github.io/promises-spec/) promise to behave, but have one difference: Mithril promises attempt to execute synchronously if possible.
 
 #### Synchronous execution