* 'master' of github.com:mojombo/jekyll: Update history to reflect merge of #1191 Update history to reflect merge of #1151 Moving Quick-start guide to own section Remove extra parentheses and swapped regex back Combined two features into one