so many re-organizations. soz
 massive reorganizations
 fix _getBranchId namde
adding workshop plus a ton of fixes
 adding z_workdir
master='' getBranchId is not private
 getBranchId fixes