View and Controller Update

views now display 2014 data properly, with small changes to model to calculate more data effectively, and FakeDataMaker to produce better match accurate data