Reorder godeps to make the diff less wacky