Better token aware test
Added fixes for Jenkins issues
Revert test fix that pointed out JAVA-313
Merged datastax 2.0
Merged datastax 2.0
Merge pull request #166 from joaquincasares/better_token_aware_test_2.0

Better token aware test
Merge pull request #167 from joaquincasares/jenkins_0421

Added fixes for Jenkins issues
Remove failure from being necessary and add a few more tests.
Merge pull request #175 from joaquincasares/jenkins_05.14.2014

Remove failure from being necessary and add a few more tests.
Javadoc fixes
Merge branch '2.0' into 2.1
Mapping javadoc fixes
Merge branch '2.1' of https://github.com/datastax/java-driver into 2.1