Fixed broken doctests
Enabled profiling for dist.pyx
Fixed merge errors
Merge branch 'master' of https://github.com/roed314/OMS