add hostname to hiera hierarchy, remove apache from puppet
move base to modules