Update gemfile and config yml
Remove duplicated layout informations
Merge branch 'jekyll-2-0-3'