updated to pyne
Merge pull request #850 from scopatz/pyne-up

Updated to PyNE v0.4