Merge pull request #38 from bazelbuild/flag_refactor

Flag refactor