Clean up _read_resolved and _read_unresolved.
Merge branch 'staging' of github.com:jdangerx/pyne into staging