Fixes for citations

Fixes:
* bad citation references
* wrong citation types
* author for Astropy paper so that it doesn't render as "Collaboration et al."