Changes from review comments
Fixing lintian warning
Merge remote-tracking branch 'mfisch/master'
Merge remote-tracking branch 'github/master'
Update to 0.2.5. Fix a build error that occurs when configure has
not been run once before.
Fix email address
Merge remote-tracking branch 'mfisch/master'