update .travis.yml
Merge branch 'master' of github.com:kouichi/TravisCi-Test

Conflicts:
	.travis.yml