Combined merge and save
Broke up get_all_feeds func to make debugging easier
Reduced threads for testing
In a bad state but that's the end of it today