updated pyne
added readme about installing from conda
Merge pull request #1012 from scopatz/pyneup

updated pyne
grate success
Merge pull request #1013 from scopatz/inst

added readme about installing from conda
nightly build