Per https://github.com/astropy/astropy/pull/895#issuecomment-21372540 the '+ lensing' should be removed.

Conflicts:

	astropy/cosmology/parameters.py
Merge pull request #1277 from aconley/comoving_volume_array

Allow comoving volume to accept arrays in non-flat case. Add unit test.
Conflicts:

	astropy/cosmology/core.py
	astropy/cosmology/tests/test_cosmology.py
Add changelog entry for #1277
Merge pull request #1279 from iguananaut/fits-test-issue

Fix minor issue in fhe io.fits tests
Preparing release 0.2.4
Back to development: 0.2.5