cleaned up ContentDescriptor and DBAdapter classes to better support multiple tables per DB/CP.
Merge branch 'master' of git://github.com/mawalker/druid