Correct error path for options parsing

Really handle ':' and '?', don't let '*' catch them!
Revert "Correct error path for options parsing"

This reverts commit 4b96eb4bdc47dae39a81c32b30638247bf163c62.
Real correction of error path
Merge branch 'master' of github.com:Aversiste/gravatarhash