Cleaned up formatting and added a maven dependency management to keep the servlet-api from being included in the war