Just noticed that this will break when Servlet 3.1 comes out. This is find for now, but we might want to find a better way of resolving/specifying the version