clean up code
changes in README.md
Merge remote-tracking branch 'upstream/master'
adjust filenotfound error
Merge pull request #124 from LinguList/master

Clean up code in model.py, derive.py, and setup.py