updated pyne, closed #1001
Merge pull request #1002 from scopatz/pyne-up

updated pyne, closed #1001