I know I said I wouldn't work on this any more but I can't help it!  Please forgive me
Merge branch 'initialos' of github.com:uberj/refspec-r10k into initialos