Bump akka and blockmanager timeouts to 60 seconds
Merge pull request #639 from pwendell/timeout-update

Bump akka and blockmanager timeouts to 60 seconds
Fixing bug in BlockManager timeout
Merge pull request #640 from pwendell/timeout-update

Fixing bug in BlockManager timeout