Updated max entities to 1000
Merge pull request #334 from rackerlabs/max-entities-1000

Update max entities to 1000
Merge branch 'master' into test-fix
added waittime after webhook execution