increase re-attach timeout to 60 seconds, remove deprecated file
Merge branch 'master' of github.com:makeusabrew/decking