Upgrade to Jekyll 2.0
Support for syntax-highlighting
Formatting
Merge branch 'jekyll-2-0'