naming of json files modified to include domain and cycle time
resolving conflicts in branches
added dispatch.py
put powercurve functionality into module power.py
rewrite of time series extraction code to use json configation file