Replace home grown Multimap with guava
Update README.md
Update README.md
Merge pull request #168 from trevorbernard/master

Various improvements