Index: branches/locker-dev/locker/deploy/bin/rails
===================================================================
--- branches/locker-dev/locker/deploy/bin/rails	(revision 2277)
+++ branches/locker-dev/locker/deploy/bin/rails	(revision 2278)
@@ -83,8 +83,8 @@
 #   RewriteBase /myrailsapp
 
+RewriteCond index.html -f
 RewriteRule ^\$ index.html [QSA]
-RewriteRule ^([^.]+)\$ \$1.html [QSA]
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)\$ dispatch.fcgi [QSA,L]
+RewriteRule ^(.*)\$ dispatch.fcgi/\$1 [QSA,L]
 
 # In case Rails experiences terminal errors