update travis config
Merge branch 'master' into google_code

Conflicts:
	.travis.yml