Added support for ember-script preprocessing
Updated changelog
Changelog to match proper style
Merge remote-tracking branch 'upstream/master' into feature/ember-script-support

Conflicts:
	CHANGELOG.md
Merge pull request #526 from rtablada/feature/ember-script-support

Added support for ember-script preprocessing