added Buildable2 for map-like containers, updated Buildables and related bits
Merge commit 'b0f801b4454125a897c8f14f6d53c5084e0d0400'
Cleanups in Gen.scala