Name preparations
Merge branch 'dev' of github.com:tdi/pyPEPA into dev

Conflicts:
	pypepa/pepa_model.py