Refactoring CLI to simplify and integrate with Spark model better

NOT READY FOR MERGE
Whoops, I was just slashing some stuff.  I actually couldn't tell what it's used for, or why it's in the repo, though.