Switched to using xctool.
Removed local xctool folder so it can be tested properly with travis.