added longer timeout to biosql
Merge branch 'master' into stable