Ok, 5am, it works.  For real.
Merge branch 'master' of github.com:malathion/config