Merge branch 'master' of https://github.com/abgo/pyflect

Conflicts:
	README.rst
Merge branch 'master' of https://github.com/abgo/pyflect