rewrote model_logistic.  Added some requirements for FeatureGeneration
Merge branch 'master' of https://github.com/charlesdguthrie/frontrow

Conflicts:
	scripts/FeatureGeneration.py