Merge branch 'master' into category-db

Conflicts:
	couchdb/_design/categories/validate_doc_update.js
	couchdb/_design/categories/views/by_tags/map.js
	couchdb/_design/categories/views/by_update/map.js
	couchdb/categories/_design/categories/validate_doc_update.js
	couchdb/categories/_design/categories/views/by_tags/map.js
	couchdb/categories/_design/categories/views/by_update/map.js
	couchdb/general/_design/categories/validate_doc_update.js
	couchdb/general/_design/categories/views/by_tags/map.js
	couchdb/general/_design/categories/views/by_update/map.js
	couchdb/general/_design/sanitizing_rules/views/by_slug/map.js
	couchdb/general/_design/sanitizing_rules/views/by_target/map.js
	doc/dev/couchdb-views.rst
	mygpo/db/couchdb/__init__.py
	mygpo/db/couchdb/management/commands/sync-design-docs.py