References #1684: Backported r31072. Updated licenses

git-svn-id: http://chianti.ucsd.edu/svn@31077 0ecc0d97-ab19-0410-9704-bfe1a75892f5
References #1684: Backported r31072. Updated licenses

git-svn-id: http://chianti.ucsd.edu/svn@31078 0ecc0d97-ab19-0410-9704-bfe1a75892f5
References #1684: Backported r31072. Updated licenses

git-svn-id: http://chianti.ucsd.edu/svn@31079 0ecc0d97-ab19-0410-9704-bfe1a75892f5
References #1684: Fixed files that didn't patch cleanly the first time around


git-svn-id: http://chianti.ucsd.edu/svn@31080 0ecc0d97-ab19-0410-9704-bfe1a75892f5
References #1684: Fixed files that didn't patch cleanly the first time around


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