more changes
Merge branch 'druid-paper' of github.com:metamx/druid into druid-paper

Conflicts:
	publications/vldb/druid.pdf
	publications/vldb/druid.tex