Eval metrics

Merging eval_metrics to master. Proposal generation code is now test ready. evaluation code needs more work, in progress.