Rebello inks new three-year deal with FC Goa