Cleaned up dependence on asciidata

Still trying to get rid of that pesky module, so I can use my code on
hotfoot
New screen_eq_dict is working for now

Also modified use of halodict in model_halo module
Changed halo.E0 to halo.energy
Analytic functions now process halo dictionaries