looks like sies-enabled is good to go
Apache initial configs
Merge branch 'master' of github.com:hcs/puppet-config

Conflicts:
	modules/apache2/manifests/init.pp
removed salstuff directory