Merge branch 'master' of github.com:aexmachina/ember-cli

* 'master' of github.com:aexmachina/ember-cli:
  Interim solution to pass options to the Javascript preprocessor
  Add support for broccoli-jstransform
  Ability to specify options for CSS preprocessor

Conflicts:
	lib/broccoli/ember-app.js