Add timeout
Revert "Add timeout"

This reverts commit 74b191917931278e61f24a560ed0978fd5950118.
Update devise to 3.1.0