Merge branch 'master' of github.com:gocql/gocql

Conflicts:
	AUTHORS

AUTHORS

@@ -23,4 +23,5 @@ Dan Forest <bonjour@dan.tf>
 Miguel Serrano <miguelvps@gmail.com>
 Stefan Radomski <gibheer@zero-knowledge.org>
 Josh Wright <jshwright@gmail.com>
+Jacob Rhoden <jacob.rhoden@gmail.com>
 Ben Frye <benfrye@gmail.com>

session.go

@@ -79,7 +79,8 @@ func (s *Session) SetTrace(trace Tracer) {
 
 // Query generates a new query object for interacting with the database.
 // Further details of the query may be tweaked using the resulting query
-// value before the query is executed.
+// value before the query is executed. Query is automatically prepared
+// if it has not previously been executed.
 func (s *Session) Query(stmt string, values ...interface{}) *Query {
 	s.mu.RLock()
 	qry := &Query{stmt: stmt, values: values, cons: s.cons,