[#1253] Move user guides from the wiki to the repository
[#1253] Remove contents block and fix warning on the sysadmin guide
[#1253] Get images into our repository, instead of Flickr
[#1253] Fixing licence -> license to follow US English
[#1253] Change the titles to comply to our docs' guidelines
[#1253] Change "Organization" capitalization to comply with our guidelines
[#1253] Add text about the user/sysadmin guides on the index page.
[#1253] De-indent lists in the user guide.
[#1253] Remove redundancy and cross-link "Getting Started" and "Sysadmin Guide"
[#1253] Fix a few section titles' capitalization
[#877] First cut of adding Nginx instructions
[#1253] Fix style headings to comply with our docs guidelines
Merge branch 'master' into 877-nginx-instructions
Update instructions for Nginx config file
[#1334] change the docs
Merge pull request #1334 from okfn/1334-change-the-docs-to-datapusher

Change docs to point to datapusher docs.
Merge branch 'master' of github.com:okfn/ckan into 877-nginx-instructions
Merge branch '877-nginx-instructions'
Fix a Sphinx error
Merge branch 'master' of github.com:okfn/ckan into 1253-moving-user-guides

Conflicts:
	doc/datastore.rst
	doc/deployment.rst