Added branching macros (flag-triggered conditionals).
Made flags accumulate rather than override each other in maps.
Merge branch 'master' of https://github.com/scala/scala-collections-laws
Undid testing changes.
Merge pull request #11 from Ichoran/master

Flags can be used for conditional macros.