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

Conflicts:
	sage/modular/pollack_stevens/modsym.py
small change to dist.pyx and getting beer so I don't remember the rest