Updated to latest ember-data version

* Fixed warnings introduced by the update
* Added missing model attributes
* Ordered all model attributes alphabetically
Added more stats to featured + watched streams
Fixed requirejs grunt task

Ember-data now finally has a working internal module loader, so we don't
need this workaround anymore.

Forgot to add this file in the 2cbc8dd commit.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/templates/components/stream.html.hbs