diff --git a/_config.yml b/_config.yml
index a0640840..06ac8d69 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,10 +1,9 @@
 title: Liquid Templating Engine
 description: "Liquid is a template language and accompanying rendering engine. It is built for security, so is perfect for rendering custom templates from your users."
-
 repository: https://github.com/Shopify/liquid
 
 # Build settings
-baseurl:                "/liquid/" # the subpath of your site, e.g. /blog/
+baseurl:                /liquid # the subpath of your site, e.g. /blog/
 url:                    http://liquidmarkup.org # the base hostname & protocol for your site
 markdown:               redcarpet
 redcarpet:
@@ -14,6 +13,9 @@ permalink:              pretty
 exclude:
   - README.md
   - CNAME
+  - Gemfile
+  - Gruntfile.js
+  - package.json
   - node_modules
 keep_files:             ["css"]
 
diff --git a/_includes/home-users-grid.html b/_includes/home-users-grid.html
index 22cd1fdb..5beefbad 100644
--- a/_includes/home-users-grid.html
+++ b/_includes/home-users-grid.html
@@ -1,22 +1,22 @@
 <div class="home-users-grid">
   <div class="home-users-grid__item">
     <a href="http://jekyllrb.com/" target="_blank">
-      <img src="/images/jekyll-logo.png" />
+      <img src="{{ "/images/jekyll-logo.png" | prepend: site.baseurl }}" />
     </a>
   </div>
   <div class="home-users-grid__item">
     <a href="http://www.desk.com/" target="_blank">
-      <img src="/images/salesforcedesk-logo.png" />
+      <img src="{{ "/images/salesforcedesk-logo.png" | prepend: site.baseurl }}" />
     </a>
   </div>
   <div class="home-users-grid__item">
     <a href="https://www.zendesk.com/ " target="_blank">
-      <img src="/images/zendesk-logo.png" />
+      <img src="{{ "/images/zendesk-logo.png" | prepend: site.baseurl }}" />
     </a>
   </div>
   <div class="home-users-grid__item">
     <a href="http://500px.com/" target="_blank">
-      <img src="/images/500px-logo.png" />
+      <img src="{{ "/images/500px-logo.png" | prepend: site.baseurl }}" />
     </a>
   </div>
 </div>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 04ea6be6..f631f102 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,6 +1,6 @@
 <div class="sidebar">
   <div class="sidebar--logo">
-    <a href="/">Liquid</a>
+    <a href="{{ "/" | prepend: site.baseurl }}">Liquid</a>
   </div>
   <nav class="sidebar--nav"> {% assign sections = "basics, tags, filters" | split: ", " %}
 
diff --git a/_layouts/default.html b/_layouts/default.html
index 6eff2358..463ea394 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-    <link rel="stylesheet" href="{{ 'css/main.css' | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
     <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
diff --git a/_sass/main.scss b/css/main.scss
similarity index 99%
rename from _sass/main.scss
rename to css/main.scss
index eb498cd0..131eb5e7 100755
--- a/_sass/main.scss
+++ b/css/main.scss
@@ -1,4 +1,3 @@
-
 @charset "utf-8";
 
 @import "partials/defaults";
@@ -13,5 +12,3 @@
 @import "modules/content-area";
 
 @import "vendors/syntax-highlighting";
-
-