diaspora & diaspora-git: drop split package hacks