added back options code for ComplexFeatureConfiguraiton file
added-back options code for Complex Feature configuration file
Merge branch 'up_working' into dev

Conflicts:
	src/edu/cmu/ml/praprolog/util/Configuration.java
ignore testcases/tmp
Merge pull request #6 from malcolmgreaves/dev

ComplexFeature configuration