Tweaks to fix layout issues
fix where 'build' and 'dist' where being ignored by git everywhere, and not in r2 where it was supposed to