Refactoring to prepare for screencast
Reverted use of Eaxy
Merge branch 'master' of https://github.com/jhannes/bare-knuckle-web.git

Conflicts:
	src/main/java/com/exilesoft/bareknuckleweb/ContactServlet.java
	src/test/java/com/exilesoft/bareknuckleweb/ContactServletTest.java