Updates for apache 24

Should we also move the first `RewriteEngine On` as well.  Before, there were 2 of these by mistake.  I just removed the first one and move the rest of the code to stay together.