Pull additional analysis branches and resolve config/snakefile conflicts

- Currently quite a few activate branches for additional analyses are diverging in terms of file structure  
- After the analyses are finished, aggregate these changes and do PRs for each branch in a way that ensures all of the changes can be pushed to `main`
- Additional constraints/rules in the Snakefile will likely be needed 