Add support to control what flavors are built with -Dflavors
tidy
simplify flavor execution