updated travice.yaml
Merge branch 'master' of github.com:enkidulan/hangout_api

Conflicts:
	.travis.yml