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
Add frozen keyword for CASSANDRA-7857
cql_tests fixes
Merge branch 'master' of https://github.com/riptano/cassandra-dtest
fix UDF dtest
Merge in fixes for 6974
Merge pull request #88 from snazy/7858-udf-dtest

CASSANDRA-7858 udf dtest fix
Merge branch 'master' into python-driver

Conflicts:
	snapshot_test.py