Merge pull request #722 from reaperhulk/0.2.2

backport EVP_R_DISABLED_FOR_FIPS removal, increment for 0.2.2