Removed obsolete binds & timeout for tests.
Fixing merge conflicts.
Merge pull request #56 from yeoman/clean-binds

Removed obsolete binds & timeout for tests.