Adds a harvester for Amazon AWS EC2 instances. Adds a mapping harvester for manual configuration on NATed servers