Merge branch 'master' into develop
catch errors thrown by zpar
don't need Python.h
Merge branch 'master' of github.com:EducationalTestingService/python-zpar
Merge pull request #15 from rmalouf/throw