Fix consolidate for Nunjucks engine #2223
Merge branch 'master' of github.com:balderdashy/sails