- added conf-mode to config files
Merge remote-tracking branch 'origin/master'
fixing up mac chaos