CAF config
Merge branch 'master' of github.com:cornholington/home
tweaks