Remove unused import from diagnose.py (Fixes #266)
Better error handling in g2p module
Merge pull request #269 from Holzhaus/pocketsphinx-vocabcompiler-fix

Better error handling in g2p module
Merge remote-tracking branch 'upstream/master'