tweak back to the defaults
Merge branch 'initialos' of github.com:uberj/refspec-r10k into initialos
don't use the hacks branch