On correlated x-ray scattering : analysis of solution diffraction images using angular intensity correlations in both the hard matter and soft matter regimes