Also merge sailsrc
Add support for ember handlebars compiling