Merge Github and Forecast data into a single data structure

[mhauru]

@callummole. Not even close to being ready to merge yet, just opening this to keep track of the status of the branch.