Fix .ruby-version
Update Contact Us page
More contact us updates
More contact us changes
Spacing issues
Yet another change
Add some other ministries to Contact Us page
Merge branch 'master' into fe

Conflicts:
	.ruby-version
fix gitmodules to use cruglobal where possible
Merge branch 'master' into fe

Conflicts:
	.gitmodules
able to display questionnaire, though footer isn't pushed down
more work in getting fe a mountable engine

when testing with fe branch in qe, the application loads, but some individual
pages still have crashes