Recognise scala.collection.Map as a map (fixes #77)
Merge pull request #78 from nornagon/master

Recognise scala.collection.Map as a map (fixes #77)