Upgrade all the things.
Upgrade Ember CLI to 0.0.46.
Merge branch 'cli-upgrade'

* cli-upgrade:
  Upgrade Ember CLI to 0.0.46.
  Upgrade all the things.

Conflicts:
	.jshintrc
	package.json