Make version detection work for commits on master
Make version detection work for commits on master

I'm moving away from git-flow and just using a single `master` branch
moving forward.  This patch fixes the version detection logic to work
with the `git describe` output that results from this change.

dcreager/libcork,redjack/ipset,dcreager/libcork,johnzachary/varon-t,redjack/libcork,redjack/libcork,redjack/ipset,johnzachary/varon-t,redjack/libcork,redjack/libcork,johnzachary/varon-t,dcreager/libcork,dcreager/libcork,redjack/libcork,redjack/ipset,redjack/libcork,johnzachary/varon-t,dcreager/libcork