Checkout master before deleting our temporary branches
Gracefully handle cases when we cannot find the expanded source tree
Handle when two versions have the same source directory name