Merge branch 'julia' into keelan

Conflicts:
	build_raw_sentences.py
	feature_function_tester.py
	feature_functions.py
	feature_generator.py
Merge branch 'julia' into keelan