machine specific config files
Merge branch 'master' of https://github.com/niklasda/fromSF