fixed how we do polling with samuel's patch
reverted patch and just changed poll timeout
merged with remote
Merge pull request #729 from shatterednirvana/poll-fix

fixed how we do polling with samuel's patch