make_warning
make_warning_correction
Merge branch 'develop' of https://github.com/pyne/pyne into Issue_483
fix branching in particle

also fix spacing in cinder.py
make_warning_removedfailure
make_update_failureremoveforreal
get rid of underscore variable
Merge branch 'develop' of github.com:pyne/pyne into develop
Merge pull request #565 from crbates/fix_stuff

fix branching in particle
Merge pull request #566 from rachelslaybaugh/develop

bib update