Missing site resources.
Don't sync .git repos.
Fix Core Data store migration code.
More robust against exceptions and a few other fixes.
Merge remote-tracking branch 'upstream/master'