Revert "Right, so iOS is completely borked. Try OS X"

This reverts commit 03cf28c8f01310c7b9752f0b33bac20c3d532418.
Revert "Back to best approximation of master.."

This reverts commit 600158acef5090239d1d33ce983ac2f43d9cde05.
Attempt to update xctool before build...