Merge pull request #126 from leanucci/encryption_methods_unique_names

Makes encrypt/decrypt method names unique:

Author: Houdini

lib/two_factor_authentication/models/two_factor_authenticatable.rb

@@ -113,16 +113,16 @@ def clear_direct_otp
 
       module EncryptionInstanceMethods
         def otp_secret_key
-          decrypt(encrypted_otp_secret_key)
+          otp_decrypt(encrypted_otp_secret_key)
         end
 
         def otp_secret_key=(value)
-          self.encrypted_otp_secret_key = encrypt(value)
+          self.encrypted_otp_secret_key = otp_encrypt(value)
         end
 
         private
 
-        def decrypt(encrypted_value)
+        def otp_decrypt(encrypted_value)
           return encrypted_value if encrypted_value.blank?
 
           encrypted_value = encrypted_value.unpack('m').first
@@ -137,7 +137,7 @@ def decrypt(encrypted_value)
           value
         end
 
-        def encrypt(value)
+        def otp_encrypt(value)
           return value if value.blank?
 
           value = value.to_s