Updated Rakefile and travis to drop xctool ;)
Big refactor of the workspace, now is tidier, but tests don't run from command line