Operators toMap and toMultimap again

Issue #96 and Issue #97

toMap: 3 overloads
toMultimap: 4 overloads
Added groovy test to verify overloading