Merge recipes; clean up tomcat restarts; tweak Vagrantfile