Separated logs and www directory creation
Merge branch 'master' of github.com:garethfoote/server-admin

Conflicts:
	apache/mkvhost