2nd attempt: Simplify ELB collector

Merged in the latest master
I wonder if we should have a AWS super collector that these all can inherit from to unify this stuff