bump jekyll to 1.2.0
Merge branch 'master' into jekyll-1.2.0
Merge branch 'master' into jekyll-1.2.0
Merge pull request #16 from github/jekyll-1.2.0

Bump jekyll to 1.2.0