Merge ../jekyll-bootstrap