merge from astaxie:master

barryclark/jekyll-now