Lowered this since 48*128M is something a large machine will survive
Make sure apache is present before removing default configuration file
Merge branch 'apache' of ../puppet/