Simplified reference resolving
Container's event listeners put into map to ensure none are missed when element is removed
Merge pull request #10 from rackerlabs/simplify_resolving

Simplify resolving