Fix parsing of counter types

JAVA-219 #fixes
Fix whitespace for IN clause in query builder

JAVA-218 #fixes
Merge branch '2.0' of https://github.com/datastax/java-driver into 2.0