Merging dse work into mainline 1.1 branch
reverted the group names back to the correct value
Merge pull request #172 from jasobrown/1.1

merging in changes to allow support of Datastax Enterprise