:auto_elastic_ip functionality to separate it from known :elastic_ip …

…addresses; fixing docstrings for new features. Part deaux

lib/ironfan/provider/ec2/elastic_ip.rb

@@ -58,7 +58,11 @@ def self.save!(computer)
           return unless computer.created?
           # instead of just returning if the elastic_ip is blank we first test if the symbol exists and whether an actual 
           # address exists in the collection; All three require the presence of elastic_ip in the facet definition. We
+<<<<<<< HEAD
           # also, for connecting to a VPC, can use allocation_id for the given :elastic_ip to attach an Elastic IP.
+=======
+          # also, in the case of VPC Elastic IPs, can discover and use allocation_id to attach a VPC Elastic IP.
+>>>>>>> develop
           return unless computer.server.ec2.include?(:elastic_ip)
             if ( computer.server.ec2.elastic_ip.nil? and cloud.vpc.nil? )
               # First,  :elastic_ip is set, no address is currently allocated for this connection's owner 
@@ -88,7 +92,7 @@ def self.save!(computer)
           Ironfan.step(computer.name, "associating Elastic IP #{elastic_ip}", :blue)
           Ironfan.unless_dry_run do
             Ironfan.safely do
-              if !cloud.vpc.nil?
+              if cloud.vpc.nil?
                 Ec2.connection.associate_address( computer.machine.id, public_ip = elastic_ip )
               else 
                 Ec2.connection.associate_address( computer.machine.id, allocation_id = allocation_id )