Merge branch 'dev' into dev-csv

Conflicts:
	.gitignore
	README.markdown
	gitit.sh
	testwiki/testwiki.conf
	testwiki/wikidata/main.page