Rebased handlebars into sails
Merge pull request #369 from thelastshadow/master

Handlesbars rebased