import_propensities are now a dataframe

They were a dictionary which was a total pain
added model.trade_flows
Churn around adding flows methods
remove d from calculation of flows
JSON creation stuff now working
First scenarios created

This is the first properly working version of the model.
removed some useless files