some e's somehow slipped through and were not converted to np.e
Merge remote-tracking branch 'upstream/staging' into staging

Conflicts:
	pyne/endf.pyx
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Merge remote-tracking branch 'upstream/staging' into staging
Added hash check of U235.txt to test_endf.py