Changed the servlet API version to 3. 3.1 is a bit new and requires
latest versions of application servers. Also cleaned up the formatting
of this file a little.