Fixes a major bug when sometimes source html files were getting overwritten with 'build' paths and added dist cleaning + some minor updates to watch task