increase timeouts for travis-ci
Merge branch 'develop' of ssh://github.com/meta-toolkit/meta into develop