Fix up Hash{Map,Set} imports
Merge pull request #2 from tomjakubowski/fix-hashmap-imports

Fix up Hash{Map,Set} imports