Added some more info on the yeast.json
Fixed merge, and added hopfroms to so they get added to redis store