added john as author
Merge branch 'master' of github.com:pyne/ans-winter-2013
updated refs