file cleanup
Merge branch 'aryeh' into oisin
updated config files