Updated to Vaadin 7 using their Maven archetype. UI/layout still needs work. :)