Clean up unified project and added nuspec changes from mac-x