Merged in the fix for the redirect box being broken into the fix for the "www" redirect

For some reason, despite being merged and VoT'd last month, there is no longer any trace of the "www" redirect fix I did for  http://code.google.com/p/otwarchive/issues/detail?id=3520 (or maybe I'm blind but the fix is no longer fixed). It presumably got overwritten by my other redirect fix, so I'm merging them both into one commit in the hopes that they'll both behave! :)