changes to spring config to allow for external config file
Revert "changes to spring config to allow for external config file"

This reverts commit c6093fc45998f646fb9343c364805b10195adcdf.
Backported an issue reading survey responses.
Merge branch 'ohmage-2.14' of github.com:cens/ohmageServer
Merge branch 'master' of github.com:cens/ohmageServer into ohmage-2.16