updated all config files
Merge branch 'master' of http://github.com/jgors/config_set-ups
updated all config files