change the druid version back to 0.6.115
Merge pull request #3 from druid-io/jisoo

change the druid version back to 0.6.115
brining this branch up to date with trunk