Added css watch task
use "stable" version of Ember Data w/ rc3
Merge remote-tracking branch 'origin/master'