Tests for CASSANDRA-6839
Add test coverage for IN operator on column conditions
Accept null values in element access column conditions

Done for CASSANDRA-6839
user functions test
add .iml files
review changes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/riptano/cassandra-dtest

Conflicts:
	user_functions.py
Merge branch 'master' into CASSANDRA-6839
More complete testing for collection conditions
Set initial_token for thrift_tests

Conflicts:
	thrift_tests.py
Remove path for testing 1.1
Don't grep for num_tokens when vnodes are disabled
Merge remote-tracking branch 'riptano/master' into CASSANDRA-6839
Improve debug messages
Merge branch 'master' into python-driver

Conflicts:
	cql_tests.py
	thrift_tests.py
Check for proper return type
Don't check for num_tokens if vnodes disabled
Activate test for 7499
Merge branch 'master' of github.com:riptano/cassandra-dtest