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

Conflicts:
	modules/apache2/manifests/.config_file.pp.swp
	modules/apache2/manifests/.init.pp.swp
	modules/apache2/manifests/config_file.pp
	modules/apache2/manifests/init.pp
swo to ignore
maybe need a directory
Merge branch 'master' of github.com:hcs/puppet-config