Silicone incorporation into an esterquat based fabric softener in presence of guar polymers