More clear redirect to https
Fix for template

Conflicts:
	templates/vhost/vhost_ssl_header.erb
Fixes to ssl support

Conflicts:
	templates/vhost/vhost_ssl_header.erb