Ready to compile on Jake's computer
Merge branch 'master' of https://github.com/ercgroup/forecasting