Merge develop now that travis CI is working; change travis CI badge branch to master.
Try to force freshsimulator and freshinstall as Travis xctool args
Battling travis CI and xctool