merge configs with other machine
Merge branch 'master' of github.com:o-/cfg