Update application-context.xml

Merged to a single file for extra simplicity