Fixed #233 -- made buildstep fork cleaner WRT progrium/buildstep