[FIXUP] add dist to gitignore
Merge branch 'build_system' into working