Merge Rakefiles, and introduce a pull reaper