Merge branch 'master' into sass

diff --cc README.md
Simple merge

diff --cc _config.yml
index 30929c26a490d9b993da276a1964ba1caa5bf02e,276c57ef4fec55ab51acf8866c6e5dc4530c90d1..a2229f29e7ccc0cc7333006958ba03754e8514e6
--- 1/_config.yml
--- 2/_config.yml
+++ b/_config.yml
@@@ -1,11 -1,5 +1,11 @@@
- markdown:            redcarpet
 +# Dependencies
++markdown:            kramdown
 +highlighter:         pygments
 +
  # Permalinks
 -permalink:        pretty
 +#
 +# Use of `relative_permalinks` ensures post links from the index work properly.
 +permalink:           pretty
  relative_permalinks: true
  
  # Setup