some updates
Merge branch 'master' of github.com:cinghiopinghio/config-files
merge try