Update class mappings for Yosemite and a small project reorg.
Update the Abstractor Mappings to be more robust when a new OS comes out that has not had values updated in the Mappings file.

Also add tests to ensure that this works properly.
Merge branch 'master' into defaults

* master:
  Update the Abstractor Mappings to be more robust when a new OS comes out that has not had values updated in the Mappings file.
  Update class mappings for Yosemite and a small project reorg.

Conflicts:
	MCCMailCommon/MCCMailCommon.xcodeproj/project.pbxproj