Removed archwomen http vhost, added redirection to https
Merge branch 'master' of 192.168.188.52:webserver

Conflicts:
	lighttpd/lighttpd.conf