Switch to unordered_map for speed
Use the correct vendor name
Merge pull request #97 from Metaswitch/correctly-populate-avp-map

No reviewer required - Correctly populate avp map