Bootstrapping the emberjs install.  Not sure if it works yet.
Merge remote-tracking branch 'origin/master'