Merge pull request #4 from allanderek/dev

Fixed up my comment which was badly worded and added emacs ~ style resto...
Fix in setup.py
Allow pypepa.pepa_model.PEPAModel to be called with a string representing a model rather than necessarily a filename.
Merge remote branch 'upstream/dev' into dev