Bibtex entry changed to show name of conference.
Merge branch 'master' of https://github.com/elliottbiondo/ans-winter-2014-sum-1
Minor changes for final version
Merge pull request #13 from elliottbiondo/master

Bibtex entry changed to show name of conference.
Merge branch 'master' of https://github.com/pyne/ans-winter-2014-sum