Merge pull request #124 from LinguList/master

Clean up code in model.py, derive.py, and setup.py
Merge remote-tracking branch 'upstream/master'