Switch from 'astropysics' (defunct) to 'astropy'
Clean up obs clustering code.

Bit easier to read, slightly more efficient.