Merge branch 'cleanup' of https://github.com/wichert/python-docx into wichert-cleanup

Conflicts:
	docx.py

Author: gtozzi