Added eisenstein_C2 and reorganized
reorganized
housekeeping
Added cuspidal_q, other changes
Reconciled conflicting versions.