Fixed minor issues, upgraded to Spring Security 3.2, configuration simplifications