capping the threadpool queue sizes
fixing merge conflicts
Merge pull request #35 from iplayer/cap_threadpool_queue_size

Investigate capping the thread pool queue sizes