Several fixes and additions

Fix some existing functionality, extend some unit-tests, move model-support into mixin and reuse for enyo.Control and rewrite enyo.ModelController to use the mixin, fix enyo.merge, etc.