Add timeout in wait helpers
Merge pull request #44 from edx/ammar/add-timeout-in-wait-helpers

Add timeout in wait helpers