fixing data
Merge branch 'capdev' of github.com:denmat/puppet_master into capdev
moved httpd files declaration