Merge pull request #2 from cbrachem/master

Draft of Carsten's contributions
formating edits
added author name
added john as author
Merge branch 'master' of github.com:pyne/ans-winter-2013
updated refs
fixed author formatting
moved elliots name
updated ENDF reader
Merge pull request #1 from pyne/master

merge me pleeeeeez!