Merge branch 'master' into gh-pages

[blog] / _config.yml

diff --git a/_config.yml b/_config.yml
index f25b63bf276bb06a4e9bf59a640a6e475d2a601c..110131ee2f4f4a87ff4cb0f597432f7653d3d28f 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -1,18 +1,22 @@
-# Dependencies
-markdown:            redcarpet
-highlighter:         pygments
-
 # Permalinks
 #
 # Use of `relative_permalinks` ensures post links from the index work properly.
 permalink:           pretty
+relative_permalinks: true
 
 # Setup
 title:               Poole
 tagline:             The Jekyll Butler
 url:                 http://getpoole.com
 paginate:            1
-baseurl:             /
+baseurl:             ""
+
+# Assets
+#
+# We specify the directory for Jekyll so we can use @imports.
+sass:
+  sass_dir:          _sass
+  style:            :compressed
 
 # About/contact
 author:
@@ -21,6 +25,6 @@ author:
   email:             markdotto@gmail.com
 
 # Custom vars
-version:             1.0.0
+version:             2.0.0
 github:
   repo:              https://github.com/poole/poole