Larger activity timeout
Merge branch 'feature_schedule' into feature_travis
Update yaml