Fixes a regression in 1453f7b013393678b8a616d7cfbda1b68b2c31db that would causes unecessary wait_timeouts in certain module operations when a given IP address could not be found.  Now wait_timeouts are only active during address associations of newly provisioned EIPs.
Cleanup and comment of main().

s Added wait timeout.
Merge branch 'fix_eip_regression' of https://github.com/jsmartin/ansible into jsmartin-fix_eip_regression
Re-enable the ec2_eip test
Merge branch 'jsmartin-fix_eip_regression' into devel