new demo paper
more edits
Memcache changes
updated task ID definition
Add headers
merge changes from master
Merge branch 'master' into demo-paper
more updates
more edits
fixed typo in task spec
fix hadoop
Merge branch 'master' into compute-populate-cache
review comments
merge from master
review comments
backwards compat
Merge pull request #439 from metamx/fix-hadoop

Allow multiple hadoop coordinates in preparation of Hadoop 2
update some comments on standalone hadoop indexer
Merge branch 'master' of github.com:metamx/druid

Conflicts:
	services/src/main/java/io/druid/cli/CliHadoopIndexer.java
review comments - remove unused import and extract out constants