Switch to Servlet 3 and Java config