cleanup
Merge branch 'master' of https://github.com/tupshin/rust-cassandra-driver
Merge branch 'master' of https://github.com/tupshin/rust-cassandra-driver

Conflicts:
	src/bin/async.rs
	src/bin/basic.rs
	src/bin/collections.rs
	src/bin/simple.rs
	src/cluster.rs