Fix forgotten merge conflict in a comment.
Improve error message when mapper can't determine keyspace.
Fix toString, equals and hashCode on accessor proxies (JAVA-495).
Allow empty name on Column and Field annotations (JAVA-528).
Add test for JAVA-509