Rolled back changes only for 3.1.

git-svn-id: http://chianti.ucsd.edu/svn@31047 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Updates to credits are merged from branch.

git-svn-id: http://chianti.ucsd.edu/svn@31048 0ecc0d97-ab19-0410-9704-bfe1a75892f5