Add timeout option for cloning git repo in puppet (#185)
Revert back to MySQL root user for now (#185)
Update tomcat7-maven-plugin to v2.2 to allow for redeploy
Merge pull request #198 from jembi/develop

Merge recent changes into master