timeout for discovery
Make JSHint happy and remove trailing whitespace
Change error message for discovery timeout
Adapt tests to new error message
Please the JSHint gods
Merge pull request #492 from remotestorage/Discovery_Timeout

timeout for discovery