Merge branch 'okfn' into sw

Conflicts:
	CHANGELOG.md
	messytables/any.py
	messytables/html.py
	messytables/pdf.py
	test/test_any.py
	test/test_read.py