Add apache and apt puppetlabs modules
Add firewall dependency.
Add puppetlabs mysql module.
Add configuration for lamp. Set apt-get update to run before main stage.
Fix merge conflicts