update travis
Merge branch 'master' of https://github.com/Okimi/okimi-webapp

Conflicts:
	.travis.yml