Doc fixes
Merge branch 'master' of ssh://github.com/inducer/meshpy

Conflicts:
	meshpy/gmsh_reader.py