Added support for timeouts on consuming from the ring buffer
Small fix to Disruptor DSL for WorkPool shutdown
Merge branch 'master' of https://github.com/LMAX-Exchange/disruptor into LMAX-Exchange-master

Conflicts:
	src/main/java/com/lmax/disruptor/dsl/Disruptor.java