Updated travis to use xctool
Merge changes from origin