Tidied up servlet and introduced some more mustache templating