modify mavericks makevars logic to only trigger once
move clang fixup to onDeferredInit
Merge remote-tracking branch 'origin/master' into feature/desktop-mac