Allow definition of SSL keys using paths instead of contents
Allow redirection from 80 to 443 in vhost
Merge branch 'ssl-redirect'

Conflicts:
	manifests/vhost.pp
Add boolean setting to decide whether to manage apache
Don't validate aliases as string - can be array too
Add extra settings for servernode
Merge branch 'servernode-settings'
Merge branch 'vhost-aliases'
Merge branch 'manage-apache'
Don't validate aliases as string - can be array too
Merge branch 'vhost-aliases'