Remove cruft from our travis config
Merge branch 'master' into web2py_travis

Conflicts:
	.travis.yml
Correct the URL scheme used in our tests
Re-enable the web2py tests on this branch