This is Linux only
Merge branch 'master' of https://github.com/cartman/config