Update default timeout to 30 seconds
Merge branch 'master' into timeouts

Conflicts:
	gaiatest/gaia_test.py
Merge pull request #349 from bobsilverberg/timeouts

Update default timeout to 30 seconds