Clean  up build

can't have two main() funcs in the same main package, so add flags with runMode support.
Remove Go 1.0 shims

... and fix some typos