Updated apache.conf to redirect non-canonical host SSL requests to canonical.
Merge branch 'master' of https://github.com/bigjimmy/puzzlebitch