Merge branch 'master' into 'master'

Removed :output_ext from permalink as it is no longer needed

See merge request pages/jekyll!38

_config.yml

@@ -17,6 +17,9 @@ url: "/" # the base hostname & protocol for your site
 twitter_username: jekyllrb
 github_username:  jekyll
 
+# Outputting
+permalink: /:categories/:year/:month/:day/:title
+
 # Build settings
 markdown: kramdown
 exclude: ["README.md"]