implemented ComplexFeature & ComplexFeatureLibrary, tested CFL, wip CF tests
ignoring output from ant {build,test} + Intellj IDEA project files
Merge branch 'dev' into up_working
added check to see if ConstantArg name is null @ construction;wip CFTest
added branch to handle ComplexFeature in Rule
wip -- need to come up with good automated test
ignoring some of my prototyping things [malcolm]
added ComplexFeature config file option to Configuration, added in QueryAnswerer; wip construct rule that uses it & config file
wip -- implementing *real* ComplexFeature example
added simple "Has Noun POS Tag" ComplexFeature
added various accessor methods, formatted & stylized
added log configs for ComplexFeatureLib & some CF implementations
finished (proof of concept) feature function implementation "WordBelongsToPOSGroup$Noun"
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
initial merge of complexFeature