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