Docstrings
Merge branch 'master' of https://github.com/roed314/OMS

Conflicts:
	sage/modular/pollack_stevens/manin_map.py