Needed to readd the broctl/broccoli/binpac submodules manually, as git seemed to get confused by the existing directories.