cleanup options parsing
Merge branch 'master' of git://github.com/ekg/clia

Fixes for opt parsing