Compatibility fix for numba.
Stupid merge
:Merge branch 'master' of https://github.com/albop/dolo into numba

Conflicts:
	dolo/numeric/serial_operations.py
DOC: small update
Merge branch 'numba'
Merge branch 'master' of https://github.com/albop/dolo
Changed named of complementarities in matlab generated code.