Merge pull request #67 from PierreR/master

Refactoring optparse code to be more adhoc
Apply optparse change to pdbquery