Merge pull request #985 from scouttyg/master

Fix Simple Form Foundation generator to use correct class with error
Conflicts:
	lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb