@ehsteve @Cadair should I remove these definition and add astropy unit conversion in them instead? 
Also I don't think there is an equivalency for `K` to `keV` in units. Its possible to write a new one I believe?