Updating version string format and number

Packaging tools tend to miscalculate which version is higher when "fb" is
in the version. Switch to omitting "fb" from $EXTRAVERSION. git tags will
continue to have "fb".

Signed-off-by: Andy Grover <agrover@redhat.com>