diff --git a/docs/Rakefile b/docs/Rakefile
index 62b0139e..51e9b484 100644
--- a/docs/Rakefile
+++ b/docs/Rakefile
@@ -38,11 +38,13 @@ task :serve do
     
     server = fork {        
       app = Rack::Builder.app {
-        use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
+        map "/jq" do
+          use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
+        end
         run Bonsai::DevelopmentServer
       }
       Rack::Handler.default.run(app, :Port => 5000) do
-        Launchy.open("http://localhost:5000/")
+        Launchy.open("http://localhost:5000/jq")
       end
     }    
     Watch.new("{content,templates,public}/**/*") { Bonsai::Exporter.process! }
diff --git a/docs/site.yml b/docs/site.yml
index 92a690d1..df758cef 100644
--- a/docs/site.yml
+++ b/docs/site.yml
@@ -2,9 +2,7 @@
 
 
 jq_version: 1.1
-# Next line is needed for publishing to github pages
 root: '/jq'
-# root: ''
 footer: |
   
   This website is made with [Bonsai](http://www.tinytree.info) and