Barstools now handles annotations correctly. This means that the blackboxresources for the harness and top are different and need to be merged in the build system. We also add all Sim*.cc files to default resources as our new emulator demands. We then remove them from the harness .f file to avoid having to detect which ones to include selectively.