Update some dependencies - still need to update to Persei
Update to deal with Persei and Lupa Fetchy
Fix weird merge conflicts