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