Fix bug where 2015 annual facilities included generation in all years
Fix bug where 2015 annual facilities included generation in all years

This was making an issue with extra wind generation in 2017 even worse.
Lots of extra code in here right now, need to clean it up.

gschivley/Index-variability