Merge develop to master

I want to try to look ahead for terminal case (black lives) and prune accordingly before extracting features, then we can actually use search without it taking all week.