Merge pull request #5 from allanderek/dev

pepa_model accepts model_strings
Added some of the python packaging generated directories to the .gitignore
Merge remote branch 'upstream/dev' into dev