Merge branch 'staging' of git://github.com/jdangerx/pyne into jdangerx-staging
Merge branch 'staging' of git://github.com/jdangerx/pyne into jdangerx-staging
Merge branch 'staging' of git://github.com/jdangerx/pyne into jdangerx-staging
Merge branch 'staging' of git://github.com/jdangerx/pyne into jdangerx-staging
Added pynjoy examples from IGE-305.
Removed ND2013 ref.
starting to munge the two classes together
Started making data for resolved resonance regions.