new branch which now tracks what an agent says about a specific image
an embarrassing typo
now we track where users click
readded stage1.config
I should actually add the files I changed, too
final commit before pull merge
Merge remote-tracking branch 'phil/master' into track_agent_subject_answers

Conflicts:
	analysis/CFHTLS_stage1.config
	analysis/SWAP.py
	analysis/projects/CFHTLS/stage1/CFHTLS_stage1.config
	analysis/stage1/CFHTLS_stage1.config
	analysis/swap/agent.py
	analysis/swap/mongodb.py
	analysis/swap/subject.py
finally have all clicks for a given annotation in annotationhistory!
fixed empty annotations
merging latest swarp master
made make_roc_curves.py
fixed some bugs
added a couple new files
and roc_curves
fixed merge
modified clustering to be faster (I hope!)
21 july 2014 commit. offline, lens catalog and atlas making all (largely) worked out
small bug in training_IDs found
converged getopt to argparse for lens_*
Made scripts executable