Pull from upstream

.gitignore

@@ -3,6 +3,8 @@ book3/.chinese
 config.php
 *.swp
 *.pyc
+*.bak
+~*
 __pycache__
 code.zip
 code3.zip
@@ -11,18 +13,30 @@ code3/*.zip
 book3/x.pdf
 book3/x.epub
 book3/x.mobi
+book3/x.docx
+book3/x.tex
 unit2/testtmp
 unit3/testtmp
 tsugi
 mod/*
 media/video
 media/audio
+py4e-private
 
 geodata.sqlite
+opengeo.sqlite
 content.sqlite
+content.sqlite.zip
 spider.sqlite
 friends.sqlite
 index.sqlite
+trackdb.sqlite
+rosterdb.sqlite
 gline.js
 gword.js
 *.sublime*
+secret.py
+*.apps.googleusercontent.com.json
+cron.txt
+book3/translation/book-tl/x.pdf
+tests/vendor

.htaccess

@@ -16,16 +16,13 @@
 
 <IfModule mod_rewrite.c>
     RewriteEngine on
-    RewriteRule ^ - [E=protossl]
-    RewriteCond %{HTTPS} on
-    RewriteRule ^ - [E=protossl:s]
-    RewriteRule "(^|/)\." - [F]
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_URI} !=/favicon.ico
-    RewriteRule ^ koseu.php [L]
+    RewriteRule ^ tsugi.php [L]
+    RedirectMatch 404 /\.git
 </IfModule>
 
 <IfModule !mod_rewrite.c>
-    FallbackResource koseu.php
+    FallbackResource tsugi.php
 </IfModule>