Fixed some puppet module stuff and made a better Makefile
Added a symlink to map templates and slides
Most important htaccess file
I should probably add the apache2-php module