Polished test case.
General upgrades.

Upgraded to Spring 4.1.0.RELEASE. Upgraded to latest Spring Data Commons release version, Spring Plugin 1.0, Slf4j 1.7.7, removed obsolete CGLib dependency, upgraded to Hamcrest 1.3, JUnit 4.11, Java 8.

Made config classes package private where possible. Formatting, Javadoc.
Integration Options plugin into application module.