Switch to the updated original pflag package

The changes we propose have been merged (actually rebased), so there is
no need for using my fork any more.