multi-os support in development
rehaul all os-specifc settings. lots of cleanup
fixed merge conflict