some minor cleanups to ingest firehose
Merge branch 'master' of github.com:metamx/druid into cleanup-ingest
switch reingest task to noop & fix compilation

switch back to noop task, its confusing to have a reinvest task that
does nothing.
fix compilation
Merge branch 'master' of github.com:metamx/druid into cleanup-ingest
Merge branch 'cleanup-ingest' of github.com:metamx/druid into cleanup-ingest

Conflicts:
	server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java
Merge pull request #641 from metamx/cleanup-ingest

some minor cleanups to ingest firehose