update travis build script
Merge branch 'master' of https://github.com/tomersh/AppleGuice

Conflicts:
	.travis.yml