Add optional query_string parameter to base_url function
Take query string into account in login_redirect_url
Fix comment wording for non-logged-in users