Improved the build file.
Move towards a single context configuration.
Removed some unnecessary XML configurations.
REST integration test is working.
Had IntelliJ redo its import.