Fixes local problem with Jekyll building
Add border to 'code' and 'pre'
Merge branch 'master' into gh-pages