gnupg21 2.1.1 (new formula)

New formula for gnupg2, 2.1.x branch.
doesn't this need to be `elsif` in case they've tried to build with `--with-gnupg2` and `--with-gnupg21`?