Moved flux conversion from spectrum.py back to units.py and hopefully has no circular import error on Python 3.