new server
Merge branch 'master' of https://github.com/rudymccomb/puppet-magento
updated apache module from puppet and fixed dir for hftapache