updating travis build
Merge branch 'master' of github.com:mzimmerman/appenginetesting

Conflicts:
	.travis.yml