Update gitmodules, correct path of rm-trash