Merge branch 'autodiscovery' of git://github.com/phillipCouto/gocql into autodiscover
autodiscovery: fixed uuid renaming
Tidy up some nested cases and add more blank lines and some comments.
Merge pull request #99 from Zariel/small-tidy-up

Tidy up some nested cases and add more blank lines and some comments.
Fixed bug were the retry of the query would loop indefinitely because there was a continue statement causing the increment of number of tries.
Merge branch 'autodiscovery' of https://github.com/tux21b/gocql into autodiscovery

Conflicts:
	conn_test.go
	policies.go
	topology.go

Merged in changes from upstream branch.

Added query retry support for batch queries.

Added a Session.NewBatch function so a batch object can be created with the default paramters from the cluster.