beginning work on query builder
adding query method, and expanding the column descriptor
replacing property stuff with ColumnDescriptor instances
Merge remote-tracking branch 'origin/master' into query-builder

Conflicts:
	cqlengine/models.py