first pass at setting apache header
Merge branch 'master' into apache_mod_header