Feature/elastic ip enhanced

Separated out :elastic_ip from :auto_elastic_ip