MAC: git ci/cia; gs now has -s
Merge branch 'master' of https://github.com/jasongeng/linuxconfig