Use master branch in stead of bloom branch

This includes changing all references and building
in a mechanism to automatically fix any old repos.