changed marshalling of inet addresses to restrict them to either 4 or 16 byte representations to remove extraneous bytes
Merge remote-tracking branch 'upstream/master'
re-synced fork with master
Added test to illustrate delete CAS behavior
Fix bug in boolean check
Clarify count mismatch behavior
Merge pull request #244 from dankennedy/master

Change marshalling of inet addresses to restrict them to either 4 or 16 bytes
Merge pull request #245 from relops/delete_cas

Clarify delete CAS behavior
Abstracted the Retry Policy logic to allow for custom policies.
Reduced threads and memory used by cassandra instances in travis.
Merge pull request #247 from phillipCouto/reduce_travis_resources

Reduced threads and memory used by cassandra instances in travis.
Merge remote-tracking branch 'upstream/master' into abstract_retries
Updated godocs at an attempt to improve understanding of said documentation.
Fixed spelling error.
Merge pull request #246 from phillipCouto/abstract_retries

Abstracted the Retry Policy logic to allow for custom policies.
Merge branch 'master' of github.com:gocql/gocql into 2.1_v2