Reinstated import guards
up-date
Remove unused imports

Use pylint to find unused imports and remove them.
fixed conflict in import merge
moving discretize back into ENDFDataSource
Merge remote-tracking branch 'upstream/staging' into staging
ENDF discretization should work, actually, for real, this time.
changing Eint to e_int because lowercase, adding slight docs