replace xctool with xcprety
increase timeout value to cater for cloud idleness
Merge branch 'AGIOS-181'

Conflicts:
	.travis.yml