config for mod_rewrite
Merge branch 'master' into nils