Merge pull request #172 from jasobrown/1.1

merging in changes to allow support of Datastax Enterprise