update cgi_1.py to have a more "correct" shebang
Merge remote-tracking branch 'upstream/master'