WIP - Fix Handlebars reference and normalizePath bug. Thanks Scott!