CLC-3465 Make inclusion of next year in FinAid configurable, and disabled by default

Conflicts:
	app/models/my_activities/my_fin_aid.rb
	spec/models/my_activities/my_fin_aid_spec.rb
CLC-3465 Master branch fix - Make inclusion of next year in FinAid configurable, and disabled by default
Merge pull request #2274 from ctweney/clc-3465-master

CLC-3465 Remove the 2014 - 2015 data from the CalCentral Fin Aid API