Merge pull request #1 from JohnBDonner/john-edits

John edits
update cgi-bin