remove apache stuff from standard install
merge accidentialy pulled stuff

Conflicts:
	.travis.yml
	variables.conf.tmpl