Now works without blocking on unused options
cruft
fixed clean target so tests still pass
Merge branch 'working' of git://github.com/TeamCohen/ProPPR into up_working
made complex feature flag 0x800
Merge branch 'merge_ups' into merge_dev_up_working

Conflicts:
	src/edu/cmu/ml/praprolog/util/Configuration.java
	src/edu/cmu/ml/praprolog/util/ExperimentConfiguration.java
updated CFTest so it passes; TODO make it better, currently we know that CF works due to the "WordBelongsToPOSGroup" test but this isn't automated
added stuff to ignore that is output by ./testcases/regression.sh