Added my stuff
Removed references to core
Changed apache2 refs to apache
Changed apache2 pillar references to apache