moves override of timeout
grunt
grunt
Merge pull request #105 from biversen21/develop

grunt