Merge pull request #1175 from we-also-do-cookies/update_markuru_link_to_docs

Updated link to the official Maruku repo as stated on Maruku homepage
Update history to reflect merge of #1175.
Add documentation about paginate_path to "Templates" page in the docs. Closes #1129.
Update history to reflect addition of fix for #1129.
Merge pull request #1151 from jpiasetz/refactors-steps

Combined layout and theme features into one
Update history to reflect merge of #1151
Merge pull request #1191 from leggetter/master

Moving Quick-start guide to own section
Update history to reflect merge of #1191
Update ProTip on Installation page in docs to point to all the info about Pygments and the 'highlight' tag. Fixes #1196.
Merge branch 'master' of github.com:mojombo/jekyll

* '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
Update history to reflect fixing of #1196.
Add feature to test new functionality.
Remove superfluous "After" block from step defintions.
Fixed bugs with pagination in a subdirectory.
WIP – fixing tests.
Fix tests for Pager.
Add warning when pagination is enabled but no template page has been found
Fix Pager.in_hierarchy to actually do the right thing
Fix tests to match new behaviour of Pager.paginate_path
add a cucumber feature for passing parameters to includes